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

2.4.2.4

Author: Crni-Bombarder

changelog.txt

@@ -1,4 +1,82 @@
-🐱 “Cats and Dogs” 2.4.2.3 🐶
+🐱 “Cats and Dogs” 2.4.2.4 🐶
+✢ Additions:
+	- Added jolly Hearth's Warming spirit to the main menu.
+	- Abyssinia:
+		- Added a new political advisor.
+		- Added a portrait for Alpurrt Catstein.
+	- Celestial Resistance:
+		- Added an event image for the Friendship Lodge.
+	- Changeling Lands:
+		- Add newer victory point names to Changeling namelists as surnames.
+	- Hippogriffia:
+		- Added a victory point.
+	- Katzennia:
+		- Readded the Kattail decision to revive Grover II.
+	- Les Meridiennes:
+		- Added portrait for Salade d'Oeuf.
+	- Mozzi:
+		- Added trait for starting country leader.
+	- Senturya:
+		- Add a decision to remove Loss of the Cornerstone national spirit. 
+✢ Changes:
+	- Used generic version of Communist Sympathizer icon for the unit leader trait instead of the vanilla Japanese icon.
+	- Prevent generic countries from switching ideology while a puppet.
+	- Made ranger doctrine follow others.
+	- Delay diversify special forces decision by a year.
+	- Tweaked some victory point values and state categories in Saddle Arabia and Macawia.
+	- Lowered chance of Anbennar music playing for Tobuck and Talarayi.
+	- Made AI countries hurt by Storm Kingdom avoid helping yeti-led countries.
+	- Updated East Griffonia Treaty Organization logo to match the River Coalition's logo.
+	- Adelart:
+		- AI now prioritizes Aquileian consolidation.
+	- Gryphian Host:
+		- Updated the focus "Seek Imperial Protection": Now requires being independent, at peace, and the Empire resurgent, and now will make the Gryphian Host a nominal vassal of the empire instead of being guaranteed by the Empire.
+	- Hippogriffia:
+		- A focus now gives special project breakthrough.
+		- Now starts with torpedo 2 technology.
+	- Katzennia:
+		- Uniformised the length of Kattail focuses in his second tree.
+	- Mozzi:
+		- Redone non-aligned flag.
+	- Sicameon:
+		- Changed to default griffon unit model instead of Griffonian Empire unit model.
+✢ Fixes:
+	- The River Federation no longer has its starting short term faction goal fulfilled at game start.
+	- The Karthinian Pact now starts with a short-term faction goal.
+	- Fixed broken custom division template icon.
+	- Handled edge cases for the alerts.
+	- Fixed broken distance calculations.
+	- Fixed a national spirit icon being the wrong size.
+	- Fixed loading screen for simplified Chinese language.
+	- Participants of North Zebrican War will no longer be counted as such when they are puppets of an outside power.
+	- Fixed some province terrains in Macawia.
+	- Abyssinia:
+		- Tried to fix the Patriot not leading the Patriotic Revolt against a Wingbardian puppet Regno d'Abyssinia.
+	- Adelart:
+		- Fixed templates for No Compromise, No Surrender DLC.
+		- Bypassing Skyfall wargoal focuses still allows for Skyfall integration.
+		- Jaume can only get good opinion modifier with Republics.
+	- Aquileia:
+		- Conquest decisions no longer target the wrong countries.
+	- Asterion:
+		- Added missing icon to a national spirit.
+	- Bakara:
+		- Fixed continuous focuses blocking part of Bakara River Federation tree.
+	- Diamond Mountain:
+		- Added missing war warnings for Firtree and Farbrook to the focus "Free The North".
+	- Jaki-Clan:
+		- Fixed national spirit icon not displaying properly.
+	- Katzennia:
+		- Fixed Kattail exotic weapons not having monthly nuke usage.
+		- Added some bypasses to Kattail's conquest focuses if the target nations don't exist anymore for some reason.
+	- Longsword:
+		- Fixed Rene Hora lacking proper advisor icon and using someone else's one.
+	- Nimbusia:
+		- Fixed always starting with DLC-locked technology.
+	- Miscellaneous bugfixes and improvements.
+	- Miscellaneous localisation fixes.
+
+🐱 “Cats and Dogs” 2.4.2.3 🐶
 ✢ Additions:
 	- Added faction icons for the River Coalition, the North Zebrican Coalition, Adelart factions, the Crown of Aquileia and the Entente.
 	- When uniting the River Federation, a new debuff is now applied, which has to be removed with 3 new post-unification Federation focuses.

common/ai_strategy/Storm.txt

@@ -0,0 +1,222 @@
+STORM_dont_help_the_ones_who_hurt_us = {
+	allowed = {
+		NOT = {
+			original_tag = THU
+			original_tag = GYZ
+			original_tag = STM
+			original_tag = SLC
+			original_tag = BLT
+			original_tag = CZR
+		}
+	}
+	enable = {
+		any_collection_element = {
+			collection = {
+				input = collection:countries_hurt_by_storm_king
+			}
+			tag = ROOT
+		}
+		any_other_country_with_original_tag_of = {
+			target = constant:country_groups.storm_kingdom_successors
+			exists = yes
+		}
+		NOT = { 
+			any_other_country_with_original_tag_of = {
+				target = constant:country_groups.storm_kingdom_successors
+				has_subject = ROOT
+			}
+			any_other_country_with_original_tag_of = {
+				target = constant:country_groups.storm_kingdom_successors
+				is_in_faction_with = ROOT
+			}
+		}
+	}
+
+	abort_when_not_enabled = yes
+
+	ai_strategy = {
+		type = alliance
+		id = "THU"
+		value = -500
+	}
+	ai_strategy = {
+		type = befriend
+		id = "THU"
+		value = -50
+	}
+	ai_strategy = {
+		type = equipment_market_trade_desire
+		id = "THU"
+		value = -50
+	}
+	ai_strategy = {
+		type = support
+		id = "THU"
+		value = -200
+	}
+	ai_strategy = {
+		type = send_volunteers_desire
+		id = "THU"
+		value = -200
+	}
+	ai_strategy = {
+		type = send_lend_lease_desire
+		id = "THU"
+		value = -200
+	}
+	
+	ai_strategy = {
+		type = alliance
+		id = "GYZ"
+		value = -500
+	}
+	ai_strategy = {
+		type = befriend
+		id = "GYZ"
+		value = -50
+	}
+	ai_strategy = {
+		type = equipment_market_trade_desire
+		id = "GYZ"
+		value = -50
+	}
+	ai_strategy = {
+		type = support
+		id = "GYZ"
+		value = -200
+	}
+	ai_strategy = {
+		type = send_volunteers_desire
+		id = "GYZ"
+		value = -200
+	}
+	ai_strategy = {
+		type = send_lend_lease_desire
+		id = "GYZ"
+		value = -200
+	}
+
+	ai_strategy = {
+		type = alliance
+		id = "STM"
+		value = -500
+	}
+	ai_strategy = {
+		type = befriend
+		id = "STM"
+		value = -50
+	}
+	ai_strategy = {
+		type = equipment_market_trade_desire
+		id = "STM"
+		value = -50
+	}
+	ai_strategy = {
+		type = support
+		id = "STM"
+		value = -200
+	}
+	ai_strategy = {
+		type = send_volunteers_desire
+		id = "STM"
+		value = -200
+	}
+	ai_strategy = {
+		type = send_lend_lease_desire
+		id = "STM"
+		value = -200
+	}
+
+	ai_strategy = {
+		type = alliance
+		id = "SLC"
+		value = -500
+	}
+	ai_strategy = {
+		type = befriend
+		id = "SLC"
+		value = -50
+	}
+	ai_strategy = {
+		type = equipment_market_trade_desire
+		id = "SLC"
+		value = -50
+	}
+	ai_strategy = {
+		type = support
+		id = "SLC"
+		value = -200
+	}
+	ai_strategy = {
+		type = send_volunteers_desire
+		id = "SLC"
+		value = -200
+	}
+	ai_strategy = {
+		type = send_lend_lease_desire
+		id = "SLC"
+		value = -200
+	}
+
+	ai_strategy = {
+		type = alliance
+		id = "CZR"
+		value = -500
+	}
+	ai_strategy = {
+		type = befriend
+		id = "CZR"
+		value = -50
+	}
+	ai_strategy = {
+		type = equipment_market_trade_desire
+		id = "CZR"
+		value = -50
+	}
+	ai_strategy = {
+		type = support
+		id = "CZR"
+		value = -200
+	}
+	ai_strategy = {
+		type = send_volunteers_desire
+		id = "CZR"
+		value = -200
+	}
+	ai_strategy = {
+		type = send_lend_lease_desire
+		id = "CZR"
+		value = -200
+	}
+	
+	ai_strategy = {
+		type = alliance
+		id = "BLT"
+		value = -500
+	}
+	ai_strategy = {
+		type = befriend
+		id = "BLT"
+		value = -50
+	}
+	ai_strategy = {
+		type = equipment_market_trade_desire
+		id = "BLT"
+		value = -50
+	}
+	ai_strategy = {
+		type = support
+		id = "BLT"
+		value = -200
+	}
+	ai_strategy = {
+		type = send_volunteers_desire
+		id = "BLT"
+		value = -200
+	}
+	ai_strategy = {
+		type = send_lend_lease_desire
+		id = "BLT"
+		value = -200
+	}
+}

common/ai_strategy/_documentation.md

@@ -700,4 +700,14 @@ ai_strategy = {
 	id = 35 # Strategic region Id
 	value = 100 # Percentage between 0 and 100
 }
+```
+
+### `coast_defense`
+Used to set the coast defense for a strategic region
+```
+ai_strategy = {
+	type = coast_defense
+	id = 35 # Strategic region Id
+	value = 100 # Percentage between 0 and 100
+}
 ```

common/characters/ABY.txt

@@ -836,6 +836,29 @@ characters={
 			traits = { ABY_grumpy_workcat }
 		}
 	}
+	ABY_sentrys_cat={
+		name=ABY_sentrys_cat
+		portraits={
+			civilian={
+				small = "gfx/interface/ideas/Advisors/ABY/ABY_Sentrys_cat.tga"
+			}
+		}
+		advisor = {
+			slot = political_advisor
+			idea_token = ABY_sentrys_cat
+			cost = 150
+			allowed = {
+				original_tag = ABY
+			}
+			visible = {
+				
+			}
+			available = {
+				has_country_flag = ABY_unlock_sentrys_cat
+			}
+			traits = { ABY_old_lady }
+		}
+	}
 	# ABY_larry_reteritari={
 		# name=ABY_larry_reteritari
 		# portraits={

common/characters/LSM.txt

@@ -73,7 +73,7 @@ characters={
 		portraits={
 			army={
 				large="gfx/leaders/LSM/Rene_Hora.tga"
-				small="gfx/interface/ideas/Advisors/LSM/LSM_rembert_cloudbeak.tga"
+				small="gfx/interface/ideas/Advisors/LSM/LSM_rene_hora.tga"
 			}
 		}
 		corps_commander={

common/characters/MER.txt

@@ -19,7 +19,7 @@ characters = {
 		name = "MER_salade_doeuf"
 		portraits = {
 			civilian = {
-				#large = "gfx/leaders/MER/Genevieve_Voliere.tga"
+				large = "gfx/leaders/MER/Salade_dOeuf.tga"
 			}
 		}
 		country_leader = {

common/characters/MSS.txt

@@ -1,6 +1,6 @@
 characters={
 	MSS_moronaba_zoudraogo={
-		#Note: Moro-Naba is a title, not a name
+		#Note: Moro-Naba is a title, not a name, means King of the World
 		name=MSS_moronaba_zoudraogo
 		portraits={
 			civilian={
@@ -11,6 +11,9 @@ characters={
 			ideology=tribal_council
 			expire="1965.1.1.1"
 			id=-1
+			traits = {
+				MSS_king_of_the_world
+			}
 		}
 	}
 	MSS_nazi_boni={