Merge pull request #1951 from EaW-Team/Zebrica

EaW-Team · Oct 27, 2023 · 49fdbd7 · 49fdbd7
2 parents 3cdd2ec + 3719956
commit 49fdbd7
Show file tree

Hide file tree

Showing 336 changed files with 4,971 additions and 1,962 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,43 @@
-🔥 “The Way of Fire” 2.2.1 🔥
+🔥 “The Way of Fire” 2.2.1.1 🔥
+✢ Additions:
+	- Realm of Kiria now has additional foreign policy options for their late game content.
+	- Various Kiria paths can now form their own factions.
+	- On-map decisions for Fickle Current's Kiria are now toggleable.
+	- New MIOs have been added for Lake City, and several issues with existing ones have been corrected.
+	- Sambar, Doelhi and Barasingha now have the option to form Hindia.
+	- Puerto Caballo can now core the Summer Islands.
+	- Added a new general for New Mareland, Kasa Free State, Aquileia, Our Town, and the Equestrian Liberation Front.
+	- Added generic admirals portraits for the Griffonian Republic.
+	- Added three new custom division icons.
+	- Asstyria now has a focus to generate a wargoal against Anseruk.
+
+✢ Changes:
+	- Nerfed Zaikiria to give Kiria a better fighting chance.
+	- Added logic for AI Kiria to modernise better.
+	- AI Stalliongrad and Changeling Lands should build more civilian factories before 1009.
+	- Adjusted the values of many victory points, as well as state categories.
+	- Hindian unification events are now global.
+	- Austurland's Ulfdis Aresdottir has received an updated portrait.
+	- Rebalanced starting units and factories for Asstyria and Anseruk.
+	- New background artwork for artillery tech tree.
+
+✢ Fixes:
+	- Fixed an issue where the Kirian Fragrant Flottila would not spawn.
+	- Archon Erion XII is now available as an advisor for Aquileia under correct circumstances as intended.
+	- Corrected a late game airframe having an absurdly large range value.
+	- Angriver's Black Claw focus tree no longer loads as the default one.
+	- Crystal Empire's communist path will no longer occur on their historical route.
+	- Corrected an availability issue with Greneclyf's diplomatic options.
+	- Hippogriffia now retains their puppets if they join Equestria's faction.
+	- Corrected various unit templates in line with AAT changes.
+	- Tweaked and fixed many issues with MIOs and equipment.
+	- An issue with custom division icons has been fixed.
+	- Various missing icons have been added.
+	- Optimized targeted decisions, improving performance.
+	- Miscellaneous bugfixes and improvements.
+	- Miscellaneous localisation fixes.
+
+🔥 “The Way of Fire” 2.2.1 🔥
 ✢ Additions:
 	- Full compatibility ensured with Arms Against Tyranny.
 	- Added female generic griffon Republican general portraits.

diff --git a/common/ai_strategy/CHN.txt b/common/ai_strategy/CHN.txt
@@ -1098,4 +1098,20 @@ CHN_scorched_earth = {
 			322
 		}
 	}
+}
+CHN_AI_should_build_more_factories_on_the_start = {
+	allowed = {
+		original_tag = CHN
+	}
+	enable = {
+		has_government = fascism
+		date < 1009.1.1
+	}
+
+	abort_when_not_enabled = yes
+	ai_strategy = {
+		type = building_target
+		id = industrial_complex
+		value = 50
+	}
 }
diff --git a/common/ai_strategy/STG.txt b/common/ai_strategy/STG.txt
@@ -509,4 +509,20 @@ prepare_for_all_ponies_front = {
 		id = "EQS"
 		value = 25
 	}
+}
+STG_AI_should_build_more_factories_on_the_start = {
+	allowed = {
+		original_tag = CHN
+	}
+	enable = {
+		has_government = communism
+		date < 1009.1.1
+	}
+
+	abort_when_not_enabled = yes
+	ai_strategy = {
+		type = building_target
+		id = industrial_complex
+		value = 50
+	}
 }
diff --git a/common/ai_templates/generic.txt b/common/ai_templates/generic.txt
@@ -801,7 +801,7 @@ infantry_generic = {
 			}
 		}
 
-		target_width = 21
+		target_width = 20
 		width_weight = 1
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -814,8 +814,8 @@ infantry_generic = {
 			match_value = 10000
 
 			regiments = {
-				infantry = 9
-				artillery_brigade = 1
+				infantry = 7
+				artillery_brigade = 2
 			}
 
 			support = {
@@ -1191,7 +1191,7 @@ magical_infantry_generic = {
 			}
 		}
 
-		target_width = 21
+		target_width = 20
 		width_weight = 1
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -1204,8 +1204,8 @@ magical_infantry_generic = {
 			match_value = 20000
 
 			regiments = {
-				magical_infantry = 9
-				artillery_brigade = 1
+				magical_infantry = 7
+				artillery_brigade = 2
 			}
 
 			support = {
@@ -1347,6 +1347,7 @@ mountaineers_generic = {
 		}
 
 		allowed_types = {
+			engineer
 			mountaineers
 			artillery
 			recon

diff --git a/common/ai_templates/templates_CHN.txt b/common/ai_templates/templates_CHN.txt
@@ -519,7 +519,7 @@ infantry_CHN = {
 			}
 		}
 
-		target_width = 21
+		target_width = 20
 		width_weight = 1
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -532,8 +532,8 @@ infantry_CHN = {
 			match_value = 10000
 
 			regiments = {
-				infantry = 9
-				artillery_brigade = 1
+				infantry = 7
+				artillery_brigade = 2
 			}
 
 			support = {
@@ -556,6 +556,7 @@ infantry_CHN = {
 			anti_tank
 			anti_air
 			infiltrator_company
+			logistics_company 
 		}
 	}
 }
@@ -676,6 +677,7 @@ magical_infantry_CHN = {
 			anti_air
 			infiltrator_company
 			anti_tank
+			logistics_company 
 		}
 	}
 	magical_infantry_default_CHN_2 = {
@@ -724,7 +726,7 @@ magical_infantry_CHN = {
 			}
 		}
 
-		target_width = 21
+		target_width = 20
 		width_weight = 1
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -737,8 +739,8 @@ magical_infantry_CHN = {
 			match_value = 10000
 
 			regiments = {
-				magical_infantry = 9
-				artillery_brigade = 1
+				magical_infantry = 7
+				artillery_brigade = 2
 			}
 
 			support = {
@@ -888,6 +890,7 @@ mountaineers_CHN = {
 		}
 
 		allowed_types = {
+			engineer 
 			mountaineers
 			artillery
 			recon

diff --git a/common/ai_templates/templates_EQS.txt b/common/ai_templates/templates_EQS.txt
@@ -617,7 +617,7 @@ infantry_EQS = {
 			}
 		}
 
-		target_width = 21
+		target_width = 20
 		width_weight = 1
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -630,8 +630,8 @@ infantry_EQS = {
 			match_value = 10000
 
 			regiments = {
-				infantry = 9
-				artillery_brigade = 1
+				infantry = 7
+				artillery_brigade = 2
 			}
 
 			support = {
@@ -871,7 +871,7 @@ magical_infantry_EQS = {
 			}
 		}
 
-		target_width = 21
+		target_width = 20
 		width_weight = 1
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -884,8 +884,8 @@ magical_infantry_EQS = {
 			match_value = 10000
 
 			regiments = {
-				magical_infantry = 9
-				artillery_brigade = 1
+				magical_infantry = 7
+				artillery_brigade = 2
 			}
 
 			support = {
@@ -1032,6 +1032,7 @@ mountaineers_EQS = {
 		}
 
 		allowed_types = {
+			engineer
 			mountaineers
 			unicorn_company
 			artillery
@@ -1094,6 +1095,7 @@ mountaineers_EQS = {
 
 		allowed_types = {
 			mountaineers
+			engineer
 			unicorn_company
 			artillery
 			recon
@@ -1423,6 +1425,7 @@ paratroopers_EQS = {
 			artillery
 			anti_air
 			rocket_artillery
+			unicorn_company
 		}
 	}
 }

diff --git a/common/ai_templates/templates_JER.txt b/common/ai_templates/templates_JER.txt
@@ -139,7 +139,7 @@ infantry_JER = {
 			}
 		}
 
-		target_width = 21
+		target_width = 20
 		width_weight = 1
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -152,8 +152,8 @@ infantry_JER = {
 			match_value = 10000
 
 			regiments = {
-				infantry = 9
-				artillery_brigade = 1
+				infantry = 7
+				artillery_brigade = 2
 			}
 
 			support = {
@@ -344,7 +344,7 @@ magical_infantry_JER = {
 			}
 		}
 
-		target_width = 21
+		target_width = 20
 		width_weight = 1
 		column_swap_factor = 0.01
 		reinforce_prio = 1
@@ -357,8 +357,8 @@ magical_infantry_JER = {
 			match_value = 10000
 
 			regiments = {
-				magical_infantry = 9
-				artillery_brigade = 1
+				magical_infantry = 7
+				artillery_brigade = 2
 			}
 
 			support = {
@@ -446,6 +446,7 @@ mountaineers_JER = {
 		allowed_types = {
 			mountaineers
 			artillery
+			engineer
 			recon
 			signal_company
 			field_hospital

diff --git a/common/characters/BRZ.txt b/common/characters/BRZ.txt
@@ -500,7 +500,7 @@ characters={
 				original_tag = BRZ
 			}
 
-			traits = { socialist_journalist }
+			traits = { socialist_journalist_eaw }
 		}
 	}
 	BRZ_butch={

diff --git a/common/characters/ELF.txt b/common/characters/ELF.txt
@@ -233,6 +233,27 @@ characters = {
 			}
 		}
 	}
+
+	ELF_word_filter = {
+		name = ELF_word_filter
+		portraits = {
+			army = {
+				large = "gfx/leaders/FLY/Word_Filter.tga"
+				small= "gfx/interface/ideas/Advisors/FLY/FLY_word_filter.tga"
+			}
+		}
+		corps_commander = {
+			traits = { pony_race_trait media_personality urban_assault_specialist determined_innovator infantry_leader }
+			skill = 3
+			attack_skill = 3
+			defense_skill = 4
+			planning_skill = 2
+			logistics_skill = 1
+			legacy_id = -1
+			desc = ELF_word_filter_desc
+		}
+		gender = female
+	}
 
 	ELF_fairweather_breeze = { 
 		name = ELF_fairweather_breeze

diff --git a/common/characters/EQC.txt b/common/characters/EQC.txt
@@ -297,6 +297,24 @@ characters={
 			legacy_id=719
 		}
 	}
+	EQC_Togfort_Beacon={
+		name="EQC_Togfort_Beacon_name"
+		portraits={
+			army={
+				large="gfx/leaders/EQC/TogFort.tga"
+				small="GFX_idea_EQC_togfort"
+			}
+		}
+		corps_commander={
+			traits={ pony_race_trait old_guard ambusher }
+			skill=2
+			attack_skill=1
+			defense_skill=4
+			planning_skill=1
+			logistics_skill=1
+			desc = EQC_Togfort_Beacon_desc
+		}
+	}
 	EQC_moonlight_poppy={
 		name="EQC_moonlight_poppy"
 		portraits={