Merge pull request #1752 from EaW-Team/NSB_preparations

art_credits.txt

@@ -31,6 +31,7 @@ Tsurime - Snow Puff portrait
 Aselita Selter
 Judgement - Bread Crumbs aka HERTLER GERBELS
 /u/Goered_Out_Of_My_ - Battle plan loading screen
+Kaiser Sauce - Aquileia monarchist puppet flags
 
 Equestrian Liberation Front End Screen:
 Cofido - Mane 6, StarTrix, and Spike silhouettes

changelog.txt

@@ -1,4 +1,80 @@
-🦅 “Two Eagles: Arsenal of Harmony” 1.9.1.9 🦅
+🦅 “Two Eagles: Arsenal of Harmony” 1.9.1.10 🦅
+✢ Added lategame land doctrines.
+✢ Added more railways and hubs in New Mareland and Equestria.
+✢ Added missing localisation for Lunar New Mareland events.
+✢ Added some new focus icons for Feathisia and Angriver.
+✢ Added portrait for Miner Council in Talouse.
+✢ Added unique flags for monarchist Aquileia's puppets.
+✢ Added event for Lunar Empire about Evening Dew in New Mareland.
+✢ Added new GUI for Aquileian revolution decisions.
+✢ Added khakistocracy subideology, which is not used anywhere yet.
+✢ Added chief of army role for Emperor Grover II.
+✢ Added unique flag and cosmetic tag for Groverist Hellquill.
+✢ Added new event pictures for Griffenheim-related events.
+✢ Added Penal Battalions for MARESOC, Baltimare, communist Wingbardy, Cyanolisia, and GEU.
+✢ Added unique concerns for Griffonian Republic, and some concern icons for Falcor.
+✢ Fixed CTD in Baltimare mayor's fate event.
+✢ Science base levels now affect doctrine cost.
+✢ Fixed Falcor national spirit's naval doctrine bonus.
+✢ Made Golden Morning have Esotericism subideology.
+✢ Made River Coalition countries less eager to send volunteers to communist Longsword.
+✢ Hopefully fixed monarchist Vinovia ending up at war with other monarchists during the Second Aquileian Revolution.
+✢ National Republican Army now uses Griffonian Republic's welcomescreen.
+✢ Fixed Lunar Crystal Empire and MARESOC generals not being recruited.
+✢ Hopefully fixed issues with Sunrise Sparkle.
+✢ Fixed various character issues with Hector's and Caramel's revolts in River Republic and made them slightly weaker.
+✢ Fixed some issues with Griffonian Republic, Aquileia and ELF characters.
+✢ Made sure Glitterhoof is removed alongside Diellza in Katerin.
+✢ Fixed issues with Tempest Wind in Lunar Empire.
+✢ Fixed various advisor icons and leader portraits.
+✢ Lunar Empire and ELF now start with some trains.
+✢ Slightly nerfed lategame motorized.
+✢ Equestria can no longer instigate a coup in puppet Olenia.
+✢ Fixed Aquileia being able to get Erion without owning Romau.
+✢ Fixed Francistrian focus "Ennoble Vittorio" not working properly.
+✢ Changed color of Evi cosmetic tag.
+✢ Crushing the FLNT as Francistria now appeases fascists.
+✢ Fixed issues Thorax's Olenian advisors.
+✢ City-state Cyanolisia now retakes its land when puppeting Asterion.
+✢ Fixed issues with Farbrook leaders fleeing the country.
+✢ Tarrin can no longer ask countries to recognize their independence if they're a puppet.
+✢ Fixed Red Archons advisors not being available when they should be.
+✢ Equestria becoming a Republic now drops the royal title from the names of Luna and Blueblood.
+✢ Improved stats of Wingbardy generals.
+✢ Fixed Longsword and Wingbardy tanks not accounting for NSB.
+✢ No infrastructure game rule now removes hubs and railways as well.
+✢ Fixed missing building slots in some Haukland dockyard focuses.
+✢ Brodfeld no longer asks communist countries for aid during the civil war.
+✢ Trimmel now gains "War Hero" trait after the defeat of Equestria.
+✢ Fixed various reinforce rate penalties being high enough to disable reinforcement entirely.
+✢ Different Reformisten paths in Hellquill now get different party names.
+✢ Harmonic Francistria stops being a puppet of Wingbardy if they become communist.
+✢ Equestrian South-East Civil War victory events should now trigger much faster.
+✢ Made capital movement permanent when forming Griffonian Empire or Herzland.
+✢ Fixed some focuses in Griffonian Republic being available without owning necessary states.
+✢ Removed game rules for unified Griffonian Empire and Republic.
+✢ Fixed Dark Wing not becoming leader when Stalliongrad is puppeted by Equestria.
+✢ Diamond Mountain no longer has to leave the River Coalition when stopping the coup by River Republic.
+✢ Reduced starting war support for various countries.
+✢ Removed unnecessary focus bypasses in Falcor.
+✢ Falcorian supremacy path no longer uses german.
+✢ Changed war types of various civil wars into civil wars.
+✢ Fixed issues with Sunset not being renamed properly. Also, the name is now reset if New Mareland is annexed.
+✢ Fixed being able to rename Stalliongrad without actually owning it.
+✢ Fixed non-aligned Tarrin still having the negative Burgundy Order national spirit.
+✢ Fixed communist Francistria being able to please fascists by completing Tarrin focuses.
+✢ Various small tweaks to Olenian and Falcorian states.
+✢ Crystal Empire can no longer spawn divisions in a state it doesn't control.
+✢ Military training decision now gives air and navy XP as well.
+✢ Adjusted stats of jet planes.
+✢ Cranberry Marsh state now has provinces with marsh terrain.
+✢ Fixed Hellquill having two navy theorists.
+✢ Fixed generic leaders and operatives not getting correct portraits.
+✢ Dehumanized some GFX.
+✢ Miscellaneous bugfixes and improvements.
+✢ Miscellaneous localisation fixes.
+
+🦅 “Two Eagles: Arsenal of Harmony” 1.9.1.9 🦅
 ✢ Added some focuses to Lunar New Mareland that allow them to stop being a puppet and unlock decisions to release South Griffonian nations as puppets.
 ✢ Added more flavour events for Lunar New Mareland.
 ✢ Added state lore for Dodge City, Trottingham and Acornage.

common/ai_strategy/RIV.txt

@@ -258,7 +258,7 @@ RIV_support_LSC = {
 	ai_strategy = {
 		type = send_volunteers_desire
 		id = "LSC"
-		value = 100
+		value = 25
 	}
 }
 RIV_support_HLQ = {

common/characters/ANG.txt

@@ -390,8 +390,10 @@ characters={
 				}
 			}
 			visible = {
-				has_completed_focus = ANG_red_archons
-				has_country_flag = ROU_red_archons
+				OR = {
+					has_completed_focus = ANG_red_archons
+					has_country_flag = ROU_red_archons
+				}
 			}
 			traits = { archon_arcturius }
 		}
@@ -413,8 +415,10 @@ characters={
 				}
 			}
 			visible = {
-				has_completed_focus = ANG_red_archons
-				has_country_flag = ROU_red_archons
+				OR = {
+					has_completed_focus = ANG_red_archons
+					has_country_flag = ROU_red_archons
+				}
 			}
 			traits = { archon_eyr }
 		}
@@ -433,8 +437,10 @@ characters={
 				original_tag = ANG
 			}
 			visible = {
-				has_completed_focus = ANG_red_archons
-				has_country_flag = ROU_red_archons
+				OR = {
+					has_completed_focus = ANG_red_archons
+					has_country_flag = ROU_red_archons
+				}
 			}
 			traits = { archon_boreas }
 		}

common/characters/BAR.txt

@@ -214,7 +214,7 @@ characters={
 		portraits={
 			army={
 				small="gfx/interface/ideas/Advisors/BAR/idea_Janosik.tga"
-				large="gfx/leaders/BAR/janosik.dds"
+				large="gfx/leaders/BAR/Janosik.dds"
 			}
 		}
 	}

common/characters/CRY.txt

@@ -404,11 +404,8 @@ characters={
 				small = "GFX_idea_CRY_snow_puff"
 			}
 		}
-
-
+
 		corps_commander = {
-
-
 			traits = { trait_mountaineer winter_expert trait_reckless thestral_race_trait }
 			skill = 2
 			attack_skill = 2
@@ -422,7 +419,7 @@ characters={
 			}
 		} 
 	}
-	
+
 	CRY_wild_strikes = {
 		name = CRY_wild_strikes
 		portraits = {
@@ -431,7 +428,7 @@ characters={
 				small = "GFX_idea_CRY_wild_strikes"
 			}
 		}
-		
+
 		corps_commander = {
 
 			traits = { infantry_leader cavalry_leader organizer thestral_race_trait }
@@ -447,7 +444,7 @@ characters={
 			}
 		} 
 	}
-	
+
 	CRY_sombra = {
 		name = sombra_chief
 		portraits = {

common/characters/DED.txt

@@ -84,7 +84,7 @@ characters={
 		portraits={
 			army={
 				large="gfx/leaders/DED/Nezhit.tga"
-				small=GFX_Nezhit
+				small=GFX_Nezhit_small
 			}
 		}
 		field_marshal={
@@ -237,7 +237,7 @@ characters={
 		portraits={
 			army={
 				large="gfx/leaders/DED/Nezhit.tga"
-				small=GFX_Nezhit
+				small=GFX_Nezhit_small
 			}
 		}
 	}
@@ -246,7 +246,7 @@ characters={
 		portraits={
 			army={
 				large="gfx/leaders/DED/Nezhit.tga"
-				small=GFX_Nezhit
+				small=GFX_Nezhit_small
 			}
 		}
 	}
@@ -255,7 +255,7 @@ characters={
 		portraits={
 			army={
 				large="gfx/leaders/DED/Nezhit.tga"
-				small=GFX_Nezhit
+				small=GFX_Nezhit_small
 			}
 		}
 	}

common/characters/DEP.txt

@@ -59,7 +59,7 @@ characters={
 		portraits={
 			army={
 				large="gfx/leaders/DEP/Colt_Shadow.tga"
-				small="gfx/interface/ideas/advisors/DEP/DEP_colt_shadow.tga"
+				small="gfx/interface/ideas/Advisors/DEP/DEP_colt_shadow.tga"
 			}
 		}
 		corps_commander={
@@ -77,7 +77,7 @@ characters={
 		portraits={
 			army={
 				large="gfx/leaders/DEP/Violet_light.tga"
-				small="gfx/interface/ideas/advisors/DEP/DEP_violet_light.tga"
+				small="gfx/interface/ideas/Advisors/DEP/DEP_violet_light.tga"
 			}
 		}
 		corps_commander={

common/characters/ELF.txt

@@ -239,8 +239,8 @@ characters = {
 				small = "GFX_idea_MAN_fairweather"
 			}
 		}
-		
-		corps_commander = {
+
+		navy_leader = {
 			traits = { pony_race_trait naval_lineage navy_career_officer ironside }
 			skill = 4
 			attack_skill = 3
@@ -249,7 +249,7 @@ characters = {
 			coordination_skill = 3
 			legacy_id = 339117
 		}
-		
+
 		advisor = {
 			slot = navy_chief
 			idea_token = ELF_fairweather_breeze

common/characters/EQC.txt

@@ -1530,7 +1530,7 @@ characters={
 				small = "GFX_idea_EQC_marius"
 			}
 		}
-		gender = female
+		#gender = female
 	}
 	EQC_yuria_lovett = {
 		name = "EQC_yuria_lovett"
@@ -1562,7 +1562,7 @@ characters={
 		}
 	}
 	EQC_WNG_leonora_piumagrigia = {
-		name = "EQC_WNG_leonara_piumagrigia"
+		name = "EQC_WNG_leonora_piumagrigia"
 		portraits = {
 			civilian = {
 				large = "gfx/leaders/Asia/portrait_griffon_generic_operative_female_4.tga"

common/characters/EQS.txt

@@ -207,10 +207,10 @@ characters={
 		navy_leader={
 			traits={ sea_and_sky pony_race_trait }
 			skill=3
-			attack_skill=2
-			defense_skill=2
-			maneuvering_skill=1
-			coordination_skill=1
+			attack_skill=3
+			defense_skill=3
+			maneuvering_skill=2
+			coordination_skill=2
 			legacy_id=13
 		}
 	}
@@ -226,7 +226,7 @@ characters={
 
 		navy_leader={
 			traits={ nightmare_of_solomon pony_race_trait }
-			skill=3
+			skill=2
 			attack_skill=3
 			defense_skill=2
 			maneuvering_skill=1
@@ -248,7 +248,7 @@ characters={
 			traits={ navy_career_officer pony_race_trait ironside }
 			skill=2
 			attack_skill=1
-			defense_skill=3
+			defense_skill=4
 			maneuvering_skill=1
 			coordination_skill=1
 			legacy_id=-1
@@ -304,9 +304,9 @@ characters={
 		navy_leader={
 			traits={ navy_media_personality pony_race_trait }
 			skill=2
-			attack_skill=1
+			attack_skill=2
 			defense_skill=2
-			maneuvering_skill=1
+			maneuvering_skill=2
 			coordination_skill=1
 			legacy_id=15
 		}
@@ -324,7 +324,7 @@ characters={
 			traits={ naval_architect pony_race_trait }
 			skill=2
 			attack_skill=2
-			defense_skill=1
+			defense_skill=3
 			maneuvering_skill=1
 			coordination_skill=1
 			legacy_id=-1
@@ -1577,7 +1577,7 @@ characters={
 		name = EQS_NLR_tempest_wind
 		portraits = {
 			army = {
-				large = "gfx/leaders/NLR/TempestWind.tga"
+				large="gfx/leaders/NLR/TempestWind.tga"
 				small = "GFX_idea_EQS_NLR_tempest_wind"
 			}
 		}
@@ -1597,6 +1597,26 @@ characters={
 				}
 			}
 		} 
+		advisor = {
+			slot = high_command
+			idea_token = NLR_tempest
+
+			allowed = {
+				OR = {
+					original_tag = NLR
+					original_tag = EQS
+				}
+			}
+			visible = {
+				OR = {
+					has_global_flag = celestia_and_luna_fused
+					original_tag = NLR 
+				}
+			}
+			traits = { 
+				army_armored_1 
+			}
+		}
 		gender = female
 	}
 
@@ -2639,7 +2659,7 @@ characters={
 		portraits = {
 			army = {
 				large = "gfx/leaders/EQS/Ksen_Autumn.tga"
-				small = "gfx/interface/ideas/advisors/EQS/EQS_SOL_ksen_autumn.tga"
+				small = "gfx/interface/ideas/Advisors/EQS/EQS_SOL_ksen_autumn.tga"
 			}
 		}
 	}

common/characters/EWI.txt

@@ -71,7 +71,7 @@ characters={
 		name=EWI_nobody
 		portraits={
 			civilian={
-				large="gfx/leaders/EWI/Nobody.tga"
+				large="gfx/leaders/EWI/nobody.tga"
 			}
 		}
 	}