Merge pull request #1985 from EaW-Team/general-dev

2.2.2.5

TechChanges.txt

@@ -1,5 +1,5 @@
 The following changes are in effect from vanilla techs. This does not include additions except when they fall into the tech folder's original end date (for example, the extended support weapons tech in infantry).
-- Armored car org and HP have been doubled
+- Armored car org and HP have been doubled, and supression increased to from 2.5 to 4
 - Heavy cruiser cannons (medium cannons) have had some of their heavy attack moved to light attack
 - All non-MTG ships use MTG stats and modules
 - Floating Fortress doctrine increases battlecruiser org as well as battleship org
@@ -14,6 +14,7 @@ The following changes are in effect from vanilla techs. This does not include ad
 - Increased naval output of concentrated industry
 - BBA medium bomb bay logi strike capacity quadrupled.
 - BBA all other logi strike except machine guns/aircraft cannons halved.
+- NSB modern turret now gives +10% soft, hard, and air attack.
 
 AAT UPDATE:
 - Removed +50% IC and reliability reduction of super-heavy turrets 

changelog.txt

@@ -1,4 +1,64 @@
-🔥 “The Way of Fire” 2.2.2.4 🔥
+🔥 “The Way of Fire” 2.2.2.5 🔥
+✢ Additions:
+	- Added tank anti-air radar module.
+	- New portraits for Gilda and Gallus in Griffonstone.
+	- Reworked flag for Rumare.
+	- New advisor icons for Rainbow Dash, Flash Magnus and Carrot Top in Equestria.
+	- Added new icons for air plane and tank modules.
+	- Added a new general in Changeling Lands.
+	- New portrait for Silver Star when he is redeemed in Wittenland.
+
+✢ Changes:
+	- Slightly weakened Hayzeb Federation's starting army.
+	- Equestria can now always take the decision to rename Stalliongrad if they own it.
+	- Gallus advisor in Griffonstone now has the Friendship School Graduate trait.
+	- Verany is now the historical leader of Aquileia.
+	- Personal union autonomy level now uses the same icon as in vanilla.
+	- In Bronzehill, Prelate Gunhild's subideology is now authoritarian theocracy.
+	- Strengthened modern turret tank module slightly.
+	- The decision to ask Flowena for a loan is no longer available if they cannot afford it.
+	- Tarrin now gets claims on Aquileia when completing certain focuses.
+	- Renamed Adelart's theocratic Aquileia formable.
+	- OT-26 tank variant in Stalliongrad is now a flame tank.
+
+✢ Fixes:
+	- Fixed all countries on Equus having a developed science base.
+	- After researching a racial technology and opening the technology screen, it will now properly show the racial technology tab.
+	- Arclight in River Republic and Applethorn in Farbrook are no longer available as advisors after becoming the country leader.
+	- United Free States in April Fools' content now check for controlled states not owned, and is formed later.
+	- Kaiser Kattail now gets claims on all the cores of the nations he attacks, and will automatically declare war on any nation happening to hold these cores
+	- Kaiser Kattail can now attack any Detached Countries.
+	- The Kirian Civil War will no longer be paused by Kaiser Kattail's attacks.
+	- Fixed Austurland getting extra rewards from raiding right away rather than when they win.
+	- Fixed several issues with province shapes and terrains.
+	- Fixed demilitarized subjects being able to switch into normal ones immediately.
+	- When Equestria triggers a civil war in Olenia, the harmonic side's focuses now reload properly.
+	- Asstyria and Anseruk now get claims on each other to ensure they annex rather than puppet.
+	- Fixed faulty modifier in Colthage's state devolution national spirit.
+	- Fixed issues with focus shine effects.
+	- If the constitutionalists won in Colthage, Coltva will now return any Colthaginian states they took.
+	- Tobuck decisions regarding party popularity now account for being harmonic.
+	- Vasile tree in Tobuck accounts for Colthaginian civil war tags when adding a state modifier.
+	- Fixed faulty focus check in Crack Lightning's Hippogriffia.
+	- Fixed DLC checks for Macawian planes.
+	- Fixed Flopparnold advisor from April Fools' content showing up in regular Abyssinia.
+	- Cleaned up some country borders in Twilight Theory April Fools' content.
+	- Adelart focus about recruiting Bernier now bypasses if Greifwald has him as leader.
+	- Sixth Great Hive Changeling Lands focus now accounts for puppet Olenia owning Vanhoover.
+	- Updated Canterlot Guard and Garrison templates in Changeling Lands.
+	- Fixed issues with Falcor creating resistance in Wingbardy.
+	- Hippogriffia now also white peaces the Great War if New Mareland also white peaced after Equestria capitulated.
+	- Fixed hitboxes for new 3D models being too large.
+	- Fixed Aquileian conquest decisions no longer being available after a target got annexed or subjugated by another country.
+	- Fixed a broken Stalliongrad focus icon.
+	- Gerza's and Star Father's Colthage now gain a generic focus tree after being puppeted.
+	- Tobuck focus to claim Warzena can now be taken if the country does not exist.
+	- Blocked Star Father's Colthage from recruiting and creating avian race operatives.
+	- Dehumanized some GFX.
+	- Miscellaneous bugfixes and improvements.
+	- Miscellaneous localisation fixes.
+
+🔥 “The Way of Fire” 2.2.2.4 🔥
 ✢ Additions:
 	- Kaiser Kattail has escaped to the next universal cycle! He will return with the correct game rule enabled.
 	- 3D models have been updated for ponies, changelings and zebras.
@@ -24,42 +84,6 @@
 	- Miscellaneous bugfixes and improvements.
 	- Miscellaneous localisation fixes.
 
-🌑 “Katzenreich” 22.00.1.1 v2 🐱
-
-✢ Fixes and changes:
-	- Balance changes to Abyssinia content.
-	- Fixed some units being spawned in impassable states.
-
-
-🌑 “Katzenreich” 22.00.1.1 🐱
-
-✢ New Origin for:
-Kingdom of Abyssinia
-
-✢ New Ascension path for:
-Hippogriffia (Sirenalia path) (outsourced)
-
-✢ Additions:
-	- Gave Abyssinia new flavour events
-	- Added interactions for Abyssinia with the Dread League, Equestria and the Griffonian Empire under special circumstances
-	- Added new unit types
-	- Added a new Civic, Liberation Front, for certain Harmonic governments.
-	- Added new 3D models for ponies, changelings, and zebras (they are now much cuter)
-	- Added a cool new main menu song by Wilzy
-	- Added a cool old song by Paradox Interactive
-
-✢ Fixes and changes:
-	- Fixed bug where the timelines wouldn't interact
-	- Fixed issue with cats not being better than dogs
-	- Fixed issue where katz keeps being misspelt as cats
-	- Improved tank performance
-	- Gave the Star Father extensive gene therapy to make him more appealing to mainstream audiences.
-	- Accepted demands for more war
-	- Refactored files
-	- Removed hands
-	- Removed Herobrine
-	- Added more bugs
-
 🔥 “The Way of Fire” 2.2.2.3 🔥
 ✢ Additions:
 	- Added a new fantasy flavour event chain.

common/ai_strategy_plans/JER_alternate_strategy_plan.txt

@@ -365,7 +365,7 @@ JER_rodier_post_revolution = {
 } 
 
 JER_cecile = {
-	name = "Aquileian Neutrality Republic Plan"
+	name = "Aquileian Harmonic Plan"
 	desc = ""
 
 	allowed = {
@@ -376,10 +376,10 @@ JER_cecile = {
 	enable = {
 		NOT = { has_completed_focus = JER_fight_for_freedom }
 		OR = {
-			has_country_flag = JER_AI_JER_VERANY_P
+			has_country_flag = JER_AI_JER_GAUDREAU_P 
 			has_game_rule = {
 				rule = JER_ai_behavior
-				option = JER_VERANY_P 
+				option = JER_GAUDREAU_P
 			}
 		}
 	}

common/ai_strategy_plans/JER_historical_strategy_plan.txt

@@ -17,10 +17,10 @@ JER_historical = {
 					option = DEFAULT
 				}
 			}
-			has_country_flag = JER_AI_JER_GAUDREAU_P 
+			has_country_flag = JER_AI_JER_VERANY_P
 			has_game_rule = {
 				rule = JER_ai_behavior
-				option = JER_GAUDREAU_P
+				option = JER_VERANY_P 
 			}
 		}
 	}

common/autonomous_states/demilitarized_colony.txt

@@ -47,29 +47,6 @@ autonomy_state = {
 	}
 
 	allowed = {
-		overlord = {
-			OR = {
-				AND = {
-					original_tag = EQS
-					has_government = democratic
-				}
-				AND = {
-					original_tag = CRY
-					has_government = democratic
-				}
-				AND = {
-					original_tag = STG
-					OR = {
-						has_government = democratic
-						has_government = communism
-					}
-				}
-				AND = {
-					original_tag = SRS
-					has_government = communism
-				}
-			}
-		}
 		has_country_flag = demilitarized
 	}
 

common/autonomous_states/demilitarized_integrated_puppet.txt

@@ -48,29 +48,6 @@ autonomy_state = {
 	}
 
 	allowed = {
-		overlord = {
-			OR = {
-				AND = {
-					original_tag = EQS
-					has_government = democratic
-				}
-				AND = {
-					original_tag = CRY
-					has_government = democratic
-				}
-				AND = {
-					original_tag = STG
-					OR = {
-						has_government = democratic
-						has_government = communism
-					}
-				}
-				AND = {
-					original_tag = SRS
-					has_government = communism
-				}
-			}
-		}
 		has_country_flag = demilitarized
 
 		if = {

common/autonomous_states/demilitarized_puppet.txt

@@ -49,29 +49,6 @@ autonomy_state = {
 	}
 
 	allowed = {
-		overlord = {
-			OR = {
-				AND = { 
-					original_tag = EQS
-					has_government = democratic
-				}
-				AND = { 
-					original_tag = CRY
-					has_government = democratic
-				}
-				AND = { 
-					original_tag = STG
-					OR = {
-						has_government = democratic
-						has_government = communism
-					}
-				}
-				AND = { 
-					original_tag = SRS
-					has_government = communism
-				}
-			}
-		}
 		has_country_flag = demilitarized
 	}
 

common/characters/ABY_AF.txt

@@ -230,6 +230,9 @@ characters={
 			allowed = {
 				original_tag = ABY
 			}
+			visible = {
+				has_completed_focus = ABY_AF_onwards_to_glory
+			}
 			available = {
 				has_completed_focus = ABY_AF_onwards_to_glory
 			}

common/characters/BOI.txt

@@ -32,7 +32,7 @@ characters={
 				small="GFX_idea_BOI_Gilda"
 			}
 			civilian={
-				large="gfx/leaders/BOI/Gilda.dds"
+				large="gfx/leaders/BOI/Gilda.tga"
 			}
 		}
 		field_marshal={
@@ -116,7 +116,7 @@ characters={
 		name=BOI_gallus
 		portraits={
 			army={
-				large="gfx/leaders/BOI/Gallus.dds"
+				large="gfx/leaders/BOI/Gallus.tga"
 				small="GFX_idea_BOI_Gallus"
 			}
 		}
@@ -136,7 +136,7 @@ characters={
 				original_tag = BOI
 			}
 			traits = {
-				compassionate_gentleman
+				friendship_school_student
 			}
 		}
 	}

common/characters/CHN.txt

@@ -637,6 +637,26 @@ characters={
 			}
 		}
 	}
+	CHN_kitu={
+		name=CHN_kitu
+		portraits={
+			army={
+				large="gfx/leaders/CHN/Kitu.tga"
+				small="gfx/interface/ideas/Advisors/CHN/CHN_Kitu.tga"
+			}
+		}
+		corps_commander={
+			traits={ changeling_race_trait trickster infantry_leader trait_engineer changeling_love_succ }
+			skill=2
+			attack_skill=2
+			defense_skill=1
+			planning_skill=2
+			logistics_skill=2
+			legacy_id=-1
+			desc = CHN_DESC_KITU
+		}
+		gender = female
+	}
 	CHN_qwiksis={
 		name=CHN_qwiksis
 		portraits={