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

Crni-Bombarder · web-flow · commit 933db4e87a65 · 2026-04-05T22:48:22.000+02:00
2.5.1.3
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,24 @@
-﻿🔥 “Scorched Earth” 2.5.1.2 🌋
+﻿🔥 “Scorched Earth” 2.5.1.3 🌋
+✢ Changes:
+	- Pingland:
+		- Redrawn generic male penguin admiral.
+✢ Fixes:
+	- Tried to fix human 3D models appearing.
+	- Fixed Absolute Alicorn Rule icon being slightly misaligned.
+	- Hippogriffia:
+		- Fixed Sirenalia world conquest event not triggering.
+		- Fixed Posada's nuclear suicide sound effect.
+	- Hippone:
+		- Fixed Farbrook puppet not getting states.
+	- Imperial Condominium:
+		- Fixed wrong country leader.
+		- Fixed missing decisions.
+	- Winggarden:
+		- Fixed plane icons.
+	- Miscellaneous bugfixes and improvements.
+	- Miscellaneous localisation fixes.
+
+🔥 “Scorched Earth” 2.5.1.2 🌋
 ✢ Additions:
 	- Added a generic decision to rename the city of Francistria.
 	- Added Absolute Alicorn Rule subideology.
diff --git a/common/characters/FRE.txt b/common/characters/FRE.txt
@@ -95,6 +95,7 @@ characters={
 			defense_skill=4
 			planning_skill=3
 			logistics_skill=3
+			legacy_id=1400
 			desc = "POLITICS_RAVEN_NICCALL_DESC"
 		}
 		gender = female
diff --git a/common/decisions/EQS_ED_decisions.txt b/common/decisions/EQS_ED_decisions.txt
@@ -263,7 +263,6 @@ EQS_weather_magic_category = {
 			}
 		}
 		
-		state_target = yes 
 		days_re_enable = 45
 		days_remove = 45
 
@@ -851,7 +850,7 @@ EQS_sabotage_mechanic_decisions = {
 		}
 	}
 	
-	EQS_ED_seize_decryption_codes = [
+	EQS_ED_seize_decryption_codes = {
 		allowed = {
 			has_dlc = "La Resistance"
 		}
diff --git a/common/decisions/HIE_decisions.txt b/common/decisions/HIE_decisions.txt
@@ -5865,7 +5865,7 @@ HIE_CTH_puppet_ded = {
 					}
 				}
 				all_of_scopes = {
-					array = FKB.core_states
+					array = FBK.core_states
 					if = {
 						limit = {
 							impassable = no
diff --git a/common/national_focus/CES.txt b/common/national_focus/CES.txt
@@ -5403,7 +5403,7 @@ shared_focus = { #fix later
 				amount = 150
 			}
 		}
-		else_if = {
+		else = {
 			add_equipment_to_stockpile = {
 				type = fighter_equipment_0
 				amount = 150
diff --git a/common/national_focus/CTH.txt b/common/national_focus/CTH.txt
@@ -10651,7 +10651,7 @@ focus_tree = {
 			create_equipment_variant = {
 				name = "Colthage Class"
 				type = ship_hull_heavy_2
-				name_group = CTH_BB_HISTORICAL
+				name_group = GENERIC_NEUTRAL_BATTLESHIP
 				parent_version = 0
 				modules = {
 					fixed_ship_battery_slot = ship_heavy_battery_2
diff --git a/common/national_focus/EQS_ED.txt b/common/national_focus/EQS_ED.txt
@@ -2435,7 +2435,7 @@ shared_focus = {
 	available = {
 		has_global_flag = EQC_ED_AF_griffonian_faction_formed_flag
 	}
-	prerequisite = { focus = EQS_ED_emergency_industrialisation OR = EQS_ED_the_fluttershy_plan }
+	prerequisite = { focus = EQS_ED_emergency_industrialisation focus = EQS_ED_the_fluttershy_plan }
 	icon = GFX_goal_EQS_ED_pacifist_no_more
 	
 	completion_reward = {
diff --git a/common/national_focus/JUN.txt b/common/national_focus/JUN.txt
@@ -1815,7 +1815,7 @@ shared_focus = { #fix later
 				amount = 150
 			}
 		}
-		else_if = {
+		else = {
 			add_equipment_to_stockpile = {
 				type = fighter_equipment_0
 				amount = 150
diff --git a/common/national_focus/NMS.txt b/common/national_focus/NMS.txt
@@ -4229,7 +4229,7 @@ shared_focus = { #fix later
 				amount = 150
 			}
 		}
-		else_if = {
+		else = {
 			add_equipment_to_stockpile = {
 				type = fighter_equipment_0
 				amount = 150
diff --git a/common/national_focus/ROU.txt b/common/national_focus/ROU.txt
@@ -10078,7 +10078,6 @@ shared_focus = {
 		log = "[GetDateText]: [Root.GetName]: Focus ROU_proteus_leads_the_army"
 		GRI_archon_proteus = {
 			add_field_marshal_role = {
-				character = GER_Character_token
 				traits = { griffon_race_trait trait_reckless infantry_leader }
 				skill = 4
 				attack_skill = 7
diff --git a/common/national_focus/WIN.txt b/common/national_focus/WIN.txt
@@ -1160,7 +1160,7 @@ shared_focus = {
 						engine_type_slot = engine_4_3x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_WNG_tactical_bomber3_medium"
+					icon = "GFX_ITA_tactical_bomber3_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = medium_plane_airframe_3
@@ -1183,7 +1183,7 @@ shared_focus = {
 						engine_type_slot = engine_3_3x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_WNG_tactical_bomber2_medium"
+					icon = "GFX_ITA_tactical_bomber2_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = medium_plane_airframe_2
@@ -1205,7 +1205,7 @@ shared_focus = {
 						engine_type_slot = engine_2_3x
 						special_type_slot_1 = lmg_defense_turret
 					}
-					icon = "GFX_WNG_tactical_bomber1_medium"
+					icon = "GFX_ITA_tactical_bomber1_medium"
 				}
 				add_equipment_to_stockpile = {
 					type = medium_plane_airframe_1
@@ -1223,7 +1223,7 @@ shared_focus = {
 							engine_type_slot = engine_1_3x
 							special_type_slot_1 = lmg_defense_turret
 						}
-						icon = "GFX_WNG_early_bomber_medium"
+						icon = "GFX_ITA_early_bomber_medium"
 					}
 					add_equipment_to_stockpile = {
 						type = medium_plane_airframe_0
diff --git a/common/on_actions/eaw_on_daily_on_actions.txt b/common/on_actions/eaw_on_daily_on_actions.txt
@@ -1043,6 +1043,7 @@ on_actions = {
 						OR = {
 							exists = no
 							is_subject_of = HIP
+							tag = ZZZ
 						}
 					}
 					OR = {
diff --git a/common/scripted_effects/EAW_FAT_effect.txt b/common/scripted_effects/EAW_FAT_effect.txt
@@ -338,8 +338,8 @@ FAT_create_dynamic_MIT = {
 				transfer_state_to = PREV.PREV
 				add_core_of = PREV.PREV
 				if = {
-					limit = { is_core_of = THIS }
-					remove_core_of = THIS
+					limit = { is_core_of = PREV }
+					remove_core_of = PREV
 				}
 			}
 			puppet = PREV
diff --git a/common/scripted_guis/eaw_ABY_guis.txt b/common/scripted_guis/eaw_ABY_guis.txt
@@ -397,7 +397,9 @@ scripted_gui = {
 		# dirty =
 
 		visible = {
-			has_country_flag = ABY_show_provinces_small
+			ROOT = {
+				has_country_flag = ABY_show_provinces_small
+			}
 		}
 		mapicon_targets = {
 			target_array = core_states
diff --git a/common/scripted_triggers/EAW_race_triggers.txt b/common/scripted_triggers/EAW_race_triggers.txt
@@ -545,7 +545,6 @@ has_unit_leader_race_flag = {
 		has_unit_leader_flag = centaur_race_flag
 		has_unit_leader_flag = donkey_race_flag
 		has_unit_leader_flag = gargoyle_race_flag
-		has_unit_leader_flag = giraffe_race_flag
 		has_unit_leader_flag = hippogriff_race_flag
 		has_unit_leader_flag = horse_race_flag
 		has_unit_leader_flag = kirin_race_flag
diff --git a/events/EvilDiarchy.txt b/events/EvilDiarchy.txt
@@ -401,7 +401,7 @@ country_event = {
 			}
 			promote_character = {
 				character = EQC_ED_theevilsisters
-				ideology = nazism
+				ideology = supremacy_alicornrule
 			}
 
 			add_opinion_modifier = {
diff --git a/events/Hippogriff Events.txt b/events/Hippogriff Events.txt
@@ -12376,7 +12376,7 @@ country_event = { # Posada kills herself
 		kill_country_leader = yes
 		add_nuclear_bombs = -1
 		hidden_effect = {
-			scoped_sound_effect = "nuke_01"
+			scoped_sound_effect = "nuke"
 		}
 		add_country_leader_role = {
 			character = HIP_supreme_workers_council
diff --git a/events/JES_events.txt b/events/JES_events.txt
@@ -963,25 +963,25 @@ country_event = { #Hidden event cleaning the mess
 		435 = {
 			force_disable_resistance = JER
 			cancel_resistance = yes
-			remove_resistance_target = 435
+			#remove_resistance_target = 435
 			add_core_of = ROOT
 		}
 		448 = {
 			force_disable_resistance = JER
 			cancel_resistance = yes
-			remove_resistance_target = 448
+			#remove_resistance_target = 448
 			add_core_of = ROOT
 		}
 		376 = {
 			force_disable_resistance = JER
 			cancel_resistance = yes
-			remove_resistance_target = 376
+			#remove_resistance_target = 376
 			add_core_of = ROOT
 		}
 		517 = {
 			force_disable_resistance = JER
 			cancel_resistance = yes
-			remove_resistance_target = 517
+			#remove_resistance_target = 517
 			add_core_of = ROOT
 		}
 	}
diff --git a/events/Kirin Events.txt b/events/Kirin Events.txt
@@ -20358,7 +20358,7 @@ news_event = {
 		name = kirin_council.502.a
 		add_political_power = -75
 		effect_tooltip = {
-			country_event = { id = kirin_council.503 }
+			news_event = { id = kirin_council.503 }
 		}
 	}
 }
diff --git a/events/NewLunarEmpire Events.txt b/events/NewLunarEmpire Events.txt
@@ -3683,7 +3683,6 @@ country_event = { #New Imperial Admiralty event
 		} custom_effect_tooltip = bloodwater_stats_tp
 		add_naval_commander_role = {
 			character = NLR_burning_straits
-			portrait_path = "gfx/leaders/Pony/portrait_pony_generic_navy_13.dds"
 			traits = { pony_race_trait chief_engineer fly_swatter }
 			skill = 3
 			attack_skill = 4
diff --git a/gfx/entities/z_eaw_units_infantry.asset b/gfx/entities/z_eaw_units_infantry.asset
@@ -135,6 +135,18 @@ entity = {
 
 	scale = 0.8
 }
+entity = {
+	clone = "PONY_infantry_entity"
+	name = "infantry_2_entity"
+
+	scale = 0.8
+}
+entity = {
+	clone = "PONY_infantry_entity"
+	name = "infantry_3_entity"
+
+	scale = 0.8
+}
 
 #################################################
 ###         APRIL FOOLS 2025 ENTITIES         ###
@@ -1067,16 +1079,96 @@ entity = {
 	name = "USA_marine_alt_1_entity"	
 	version = 1
 }
+entity = {
+	clone = "HIP_infantry_entity"
+	name = "USA_marine_2_entity"	
+	version = 1
+}
+entity = {
+	clone = "HIP_infantry_entity"
+	name = "USA_marine_2_alt_0_entity"	
+	version = 1
+}
+entity = {
+	clone = "HIP_infantry_entity"
+	name = "USA_marine_2_alt_1_entity"	
+	version = 1
+}
+entity = {
+	clone = "HIP_infantry_entity"
+	name = "USA_marine_3_entity"	
+	version = 1
+}
+entity = {
+	clone = "HIP_infantry_entity"
+	name = "USA_marine_3_alt_0_entity"	
+	version = 1
+}
+entity = {
+	clone = "HIP_infantry_entity"
+	name = "USA_marine_3_alt_1_entity"	
+	version = 1
+}
 entity = {
 	clone = "HIP_infantry_entity"
 	name = "USA_mountaineers_entity"
 	version = 1
 }
+entity = {
+	clone = "HIP_infantry_entity"
+	name = "USA_mountaineers_2_entity"
+	version = 1
+}
+entity = {
+	clone = "HIP_infantry_entity"
+	name = "USA_mountaineers_3_entity"
+	version = 1
+}
 entity = {
 	clone = "HIP_infantry_entity"
 	name = "USA_paratrooper_entity"
 	version = 1
 }
+entity = {
+	clone = "HIP_infantry_entity"
+	name = "USA_paratrooper_alt_0_entity"
+	version = 1
+}
+entity = {
+	clone = "HIP_infantry_entity"
+	name = "USA_paratrooper_alt_1_entity"
+	version = 1
+}
+entity = {
+	clone = "HIP_infantry_entity"
+	name = "USA_paratrooper_2_entity"
+	version = 1
+}
+entity = {
+	clone = "HIP_infantry_entity"
+	name = "USA_paratrooper_2_alt_0_entity"
+	version = 1
+}
+entity = {
+	clone = "HIP_infantry_entity"
+	name = "USA_paratrooper_2_alt_1_entity"
+	version = 1
+}
+entity = {
+	clone = "HIP_infantry_entity"
+	name = "USA_paratrooper_3_entity"
+	version = 1
+}
+entity = {
+	clone = "HIP_infantry_entity"
+	name = "USA_paratrooper_3_alt_0_entity"
+	version = 1
+}
+entity = {
+	clone = "HIP_infantry_entity"
+	name = "USA_paratrooper_3_alt_1_entity"
+	version = 1
+}
 ##################################grifs
 
 
diff --git a/gfx/interface/ideas/Advisors/PNG/PNG_generic_navy_1.tga b/gfx/interface/ideas/Advisors/PNG/PNG_generic_navy_1.tga
diff --git a/gfx/interface/ideologies/alicornrule_supremacy.tga b/gfx/interface/ideologies/alicornrule_supremacy.tga
diff --git a/gfx/leaders/PNG/portrait_penguin_generic_navy_male_1.tga b/gfx/leaders/PNG/portrait_penguin_generic_navy_male_1.tga
diff --git a/gfx/texticons/logo/logo_chi_text.dds b/gfx/texticons/logo/logo_chi_text.dds
diff --git a/gfx/texticons/logo/logo_eng_text.dds b/gfx/texticons/logo/logo_eng_text.dds
diff --git a/gfx/texticons/logo/logo_rus_text.dds b/gfx/texticons/logo/logo_rus_text.dds
diff --git a/localisation/english/eaw_decisions_l_english.yml b/localisation/english/eaw_decisions_l_english.yml
@@ -65,7 +65,7 @@ beak_mine_expansion:0 "Expand the Beak Mines"
 northern_steel_expansion:0 "Mine the Depths of Nithean"
 jem_mines:0 "Expand the Keyholm Crystal Mines"
 tainaholm_aluminium:0 "Tainaholm Aluminium Mines"
-develop_celestia_rubber_plantations:0 "Plant Rubber Plantations in Celestia"
+develop_celestia_rubber_plantations:0 "Plant Rubber Plantations in [354.GetName]"
 develop_northern_cross_tungsten_deposits_1:0 "Develop Northern Cross Tungsten Mines"
 develop_northern_cross_tungsten_deposits_2:0 "Expand Northern Cross Tungsten Mines"
 develop_karthin_oil_fields:0 "Expand the Karthin Oil Fields"
diff --git a/localisation/english/eaw_welcomescreen_l_english.yml b/localisation/english/eaw_welcomescreen_l_english.yml
diff --git a/localisation/russian/country_BRZ_l_russian.yml b/localisation/russian/country_BRZ_l_russian.yml
diff --git a/localisation/russian/eaw_decisions_l_russian.yml b/localisation/russian/eaw_decisions_l_russian.yml
diff --git a/localisation/russian/eaw_welcomescreen_l_russian.yml b/localisation/russian/eaw_welcomescreen_l_russian.yml
diff --git a/map/unitstacks.txt b/map/unitstacks.txt

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ characters={`
`95`	`95`	`defense_skill=4`
`96`	`96`	`planning_skill=3`
`97`	`97`	`logistics_skill=3`
	`98`	`+ legacy_id=1400`
`98`	`99`	`desc = "POLITICS_RAVEN_NICCALL_DESC"`
`99`	`100`	`}`
`100`	`101`	`gender = female`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,6 @@ EQS_weather_magic_category = {`
`263`	`263`	`}`
`264`	`264`	`}`
`265`	`265`
`266`		`- state_target = yes`
`267`	`266`	`days_re_enable = 45`
`268`	`267`	`days_remove = 45`
`269`	`268`
`@@ -851,7 +850,7 @@ EQS_sabotage_mechanic_decisions = {`
`851`	`850`	`}`
`852`	`851`	`}`
`853`	`852`
`854`		`- EQS_ED_seize_decryption_codes = [`
	`853`	`+ EQS_ED_seize_decryption_codes = {`
`855`	`854`	`allowed = {`
`856`	`855`	`has_dlc = "La Resistance"`
`857`	`856`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5865,7 +5865,7 @@ HIE_CTH_puppet_ded = {`
`5865`	`5865`	`}`
`5866`	`5866`	`}`
`5867`	`5867`	`all_of_scopes = {`
`5868`		`- array = FKB.core_states`
	`5868`	`+ array = FBK.core_states`
`5869`	`5869`	`if = {`
`5870`	`5870`	`limit = {`
`5871`	`5871`	`impassable = no`
Original file line number	Diff line number	Diff line change
`@@ -5403,7 +5403,7 @@ shared_focus = { #fix later`
`5403`	`5403`	`amount = 150`
`5404`	`5404`	`}`
`5405`	`5405`	`}`
`5406`		`- else_if = {`
	`5406`	`+ else = {`
`5407`	`5407`	`add_equipment_to_stockpile = {`
`5408`	`5408`	`type = fighter_equipment_0`
`5409`	`5409`	`amount = 150`
Original file line number	Diff line number	Diff line change
`@@ -2435,7 +2435,7 @@ shared_focus = {`
`2435`	`2435`	`available = {`
`2436`	`2436`	`has_global_flag = EQC_ED_AF_griffonian_faction_formed_flag`
`2437`	`2437`	`}`
`2438`		`- prerequisite = { focus = EQS_ED_emergency_industrialisation OR = EQS_ED_the_fluttershy_plan }`
	`2438`	`+ prerequisite = { focus = EQS_ED_emergency_industrialisation focus = EQS_ED_the_fluttershy_plan }`
`2439`	`2439`	`icon = GFX_goal_EQS_ED_pacifist_no_more`
`2440`	`2440`
`2441`	`2441`	`completion_reward = {`
Original file line number	Diff line number	Diff line change
`@@ -1815,7 +1815,7 @@ shared_focus = { #fix later`
`1815`	`1815`	`amount = 150`
`1816`	`1816`	`}`
`1817`	`1817`	`}`
`1818`		`- else_if = {`
	`1818`	`+ else = {`
`1819`	`1819`	`add_equipment_to_stockpile = {`
`1820`	`1820`	`type = fighter_equipment_0`
`1821`	`1821`	`amount = 150`
Original file line number	Diff line number	Diff line change
`@@ -4229,7 +4229,7 @@ shared_focus = { #fix later`
`4229`	`4229`	`amount = 150`
`4230`	`4230`	`}`
`4231`	`4231`	`}`
`4232`		`- else_if = {`
	`4232`	`+ else = {`
`4233`	`4233`	`add_equipment_to_stockpile = {`
`4234`	`4234`	`type = fighter_equipment_0`
`4235`	`4235`	`amount = 150`