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

2.4.1.0.1

Author: Crni-Bombarder

common/decisions/ROA_decisions.txt

@@ -18,7 +18,10 @@ chisimbi_unification_decisions = {
 			log = "[GetDateText]: [Root.GetName]: Decision ROA_AI_take_GFS_fleet"
 			if = {
 				limit = { has_dlc = "Man the Guns" }
-				load_oob = "GFS_1007_naval"
+				custom_effect_tooltip = ROA_load_GFS_fleet
+				hidden_effect = {
+					load_oob = "GFS_1007_naval"
+				}
 				set_technology = {
 					basic_naval_mines = 1
 					early_ship_hull_light = 1
@@ -30,7 +33,10 @@ chisimbi_unification_decisions = {
 				}
 			}
 			else = {
-				load_oob = "GFS_1007_naval_legacy"
+				custom_effect_tooltip = ROA_load_GFS_fleet
+				hidden_effect = {
+					load_oob = "GFS_1007_naval_legacy"
+				}
 				set_technology = {
 					early_destroyer = 1
 					early_light_cruiser = 1
@@ -190,13 +196,13 @@ military_training_category = {
 			add_units_to_division_template = {
 				template_name = "Legio Praetoriani"
 				regiments = {
+					knights = 2
+					knights = 2
+					knights = 2
+					knights = 2
 					knights = 3
 					knights = 3
 					knights = 3
-					knights = 3
-					knights = 4
-					knights = 4
-					knights = 4
 				}
 			}
 		}

common/decisions/chisimbi_unification_decisions.txt

@@ -207,11 +207,43 @@ chisimbi_unification_decisions = {
 		}
 
 		visible = {
-			OR = {
-				original_tag = GFS
-				original_tag = ROA
-				original_tag = TSV
-				original_tag = IBZ
+			if = {
+				limit = { # South
+					OR = {
+						original_tag = GFS
+						original_tag = ROA
+					}
+				}
+				OR = { # Any north exists
+					TSV = {
+						AND = {
+							exists = yes
+							NOT = { is_subject_of = ROOT }
+						}
+					}
+					IBZ = {
+						AND = {
+							exists = yes
+							NOT = { is_subject_of = ROOT }
+						}
+					}
+				}
+			}
+			else = { # North
+				OR = { # Any south exists
+					GFS = {
+						AND = {
+							exists = yes
+							NOT = { is_subject_of = ROOT }
+						}
+					}
+					ROA = {
+						AND = {
+							exists = yes
+							NOT = { is_subject_of = ROOT }
+						}
+					}
+				}
 			}
 			is_subject = no
 
@@ -242,54 +274,66 @@ chisimbi_unification_decisions = {
 			}
 			if = {
 				limit = {
-					original_tag = ROA
-				}
-				declare_war_on = {
-					target = TSV
-					type = annex_everything
-				}
-				declare_war_on = {
-					target = IBZ
-					type = annex_everything
-				}
-			}
-			if = {
-				limit = {
-					original_tag = GFS
-				}
-				declare_war_on = {
-					target = TSV
-					type = annex_everything
-				}
-				declare_war_on = {
-					target = IBZ
-					type = annex_everything
-				}
-			}
-			if = {
-				limit = {
-					original_tag = IBZ
+					OR = {
+						original_tag = ROA
+						original_tag = GFS
+					}
 				}
-				declare_war_on = {
-					target = GFS
-					type = annex_everything
+				if = {
+					limit = {
+						TSV = {
+							exists = yes
+							NOT = { is_subject_of = ROOT }
+						}
+					}
+					declare_war_on = {
+						target = TSV
+						type = annex_everything
+					}
 				}
-				declare_war_on = {
-					target = ROA
-					type = annex_everything
+				if = {
+					limit = {
+						IBZ = {
+							exists = yes
+							NOT = { is_subject_of = ROOT }
+						}
+					}
+					declare_war_on = {
+						target = IBZ
+						type = annex_everything
+					}
 				}
 			}
 			if = {
 				limit = {
-					original_tag = TSV
+					OR = {
+						original_tag = IBZ
+						original_tag = TSV
+					}
 				}
-				declare_war_on = {
-					target = GFS
-					type = annex_everything
+				if = {
+					limit = {
+						GFS = {
+							exists = yes
+							NOT = { is_subject_of = ROOT }
+						}
+					}
+					declare_war_on = {
+						target = GFS
+						type = annex_everything
+					}
 				}
-				declare_war_on = {
-					target = ROA
-					type = annex_everything
+				if = {
+					limit = {
+						ROA = {
+							exists = yes
+							NOT = { is_subject_of = ROOT }
+						}
+					}
+					declare_war_on = {
+						target = ROA
+						type = annex_everything
+					}
 				}
 			}
 		}
@@ -357,21 +401,53 @@ chisimbi_unification_decisions = {
 			hidden_effect = {
 				set_global_flag = chisimbi_zeblu_attacked
 			}
-			declare_war_on = {
-				target = TSV
-				type = annex_everything
+			if = {
+				limit = { # Tzhimane Confederacy
+					TSV = {
+						exists = yes
+						NOT = { is_subject_of = ROOT }
+					}
+				}
+				declare_war_on = {
+					target = TSV
+					type = annex_everything
+				}
 			}
-			declare_war_on = {
-				target = IBZ
-				type = annex_everything
+			if = {
+				limit = { # Ibhayiz
+					IBZ = {
+						exists = yes
+						NOT = { is_subject_of = ROOT }
+					}
+				}
+				declare_war_on = {
+					target = IBZ
+					type = annex_everything
+				}
 			}
-			declare_war_on = {
-				target = GFS
-				type = annex_everything
+			if = {
+				limit = { # Imba-Zebu
+					GFS = {
+						exists = yes
+						NOT = { is_subject_of = ROOT }
+					}
+				}
+				declare_war_on = {
+					target = GFS
+					type = annex_everything
+				}
 			}
-			declare_war_on = {
-				target = ROA
-				type = annex_everything
+			if = {
+				limit = { # Roam
+					ROA = {
+						exists = yes
+						NOT = { is_subject_of = ROOT }
+					}
+				}
+				declare_war_on = {
+					target = ROA
+					type = annex_everything
+				}
 			}
 		}
 	}
@@ -410,7 +486,10 @@ chisimbi_unification_decisions = {
 		targets = { GIF }
         targets_dynamic = yes
         target_trigger = {
-            FROM = { tag = GIF }
+            FROM = { 
+				original_tag = GIF 
+				NOT = { is_subject_of = ROOT }
+			}
         }
 		cost = 25
 
@@ -556,7 +635,10 @@ chisimbi_expansion_category = {
         targets_dynamic = yes
 
         target_trigger = {
-            FROM = { tag = ZOO }
+            FROM = { 
+				tag = ZOO
+				NOT = { is_subject_of = ROOT } 
+			}
         }
 		cost = 25
 
@@ -1004,6 +1086,7 @@ chisimbi_expansion_category = {
 					original_tag = KIS
 					original_tag = KIC
 				} 
+				NOT = { is_subject_of = ROOT }
 			}
 			NOT = { has_war_with = FROM }
         }

common/units/eaw_infantry.txt

@@ -336,11 +336,11 @@ sub_units = {
             movement = 0.1
         }
         forest = {
-            attack = 0.25
+            attack = 0.2
             defence = 0.2
         }
         urban = {
-            attack = 0.75
+            attack = 0.5
             defence = 0.2
         }
 		hills = {

gfx/interface/decisions/decision_category_beakolini_alternate.dds

@@ -11,6 +11,7 @@ set_technology = {
 	tech_recon = 1
 	tech_support = 1
 	basic_train = 1
+	pre_gw_artillery = 1
 }
 if = {
 	limit = { has_dlc = "By Blood Alone" }

gfx/leaders/IBZ/IBZ_zumoya.tga

@@ -22,7 +22,7 @@ ZLU_clan_structure_idea:0 "Disunited Clan Structure"
 ZLU_clan_structure_idea_desc:0 "Shaka Khan has shown great charisma in uniting the various Zeblu clans under her, plastering over old rivalries and unsettled grudges. Yet this unification remains superficial, and quarrels amongst the commanders are all too common. And should at any point the fortune of war turn against her, the loyalty of the clans is sure to disappear again."
 
 ### Custom Modifiers
-chisimbi_annex_reduction:0 "\n§GReduced cost§! for §YTake States§! action on §Y@GFS @ROA @TSV @IBZ @ZLU @GIF Chisimbi states§! in Peace Conferences."
+chisimbi_annex_reduction:0 "\n§GReduced cost§! for §YTake States§! action on §Y@GFS @ROA @TSV @IBZ @ZLU @GIF Chisimbi states§! in Peace Conferences"
 
 ### region events
 

history/countries/IBZ - Ibhayiz.txt

@@ -21,8 +21,8 @@
 
 ### events ###
 
- newsroam.1.t:0 "The Rise of a new Empire"
- newsroam.1.d:0 "[This.GetNewspaperHeader]Unexpectedly for the whole world, a new strong state has emerged in Southeastern Zebrica over the past few years. Having begun his victorious march by uniting and capturing the trading cities on the Assini River, zebra, who calls himself Augustus, today solemnly proclaimed the creation of the Southeastern Zebrican Empire after subjugating the central Southeast by his legions. After the fall of the Zongo, few in the region may attempt to challenge its status."
+ newsroam.1.t:0 "The Rise of a New Empire"
+ newsroam.1.d:0 "[This.GetNewspaperHeader]Unexpectedly for the whole world, a new strong state has emerged in Southeastern Zebrica over the past few years. Having begun his victorious march by uniting and capturing the trading cities on the Assini River, a zebra, who calls himself Augustus, today solemnly proclaimed the creation of the Southeastern Zebrican Empire after subjugating the central Southeast by his legions. After the fall of the Zongo, few in the region may attempt to challenge its status."
  newsroam.1.a:0 "That's scary... should we have to worry about?"
  newsroam.1.b:0 "Let's hope our comrade, Lansin, will manage to resist his imperialism"
  newsroam.1.c:0 "Well... I hope we can trade with them!"
@@ -35,17 +35,21 @@
  ROA_aspiring_empire_idea:0 "Aspiring Empire"
  ROA_aspiring_empire_idea_desc:0 "Kaiser Augustus, commander of the Assini militias, can certainly be said to be an ambitious stallion. After he removed weak and indecisive city governments from power, he quickly mobilized the economy and started to look for opportunities for conquest. While he framed his first strikes as retaking Assini cities, he since dropped any pretence. Roam marches to war, to forge an empire like Zebrica has never seen."
 
+### custom tooltip ###
+
+ROA_load_GFS_fleet:0 "Transfers @GFS §YImba-Zebu§!'s navy to us"
+
 ### cosmetic ###
 
- ROA_imperial_cosmetic_tag_neutrality:0 "Southeastern Zebrican Kaiserate"
- ROA_imperial_cosmetic_tag_neutrality_DEF:0 "Southeastern Zebrican Kaiserate"
+ ROA_imperial_cosmetic_tag_neutrality:0 "Southeastern Zebrican Empire"
+ ROA_imperial_cosmetic_tag_neutrality_DEF:0 "Southeastern Zebrican Empire"
  ROA_imperial_cosmetic_tag_neutrality_ADJ:0 "Roaman"
  ROA_imperial_cosmetic_tag_democratic:0 "Southeastern Zebrican Kingdom"
  ROA_imperial_cosmetic_tag_democratic_DEF:0 "Southeastern Zebrican Kingdom"
  ROA_imperial_cosmetic_tag_democratic_ADJ:0 "Roaman"
  ROA_imperial_cosmetic_tag_communism:0 "Southeastern Zebrican Republic"
  ROA_imperial_cosmetic_tag_communism_DEF:0 "Southeastern Zebrican Republic"
  ROA_imperial_cosmetic_tag_communism_ADJ:0 "Roaman"
- ROA_imperial_cosmetic_tag_fascism:0 "Southeastern Zebrican Kaiserate"
- ROA_imperial_cosmetic_tag_fascism_DEF:0 "Southeastern Zebrican Kaiserate"
+ ROA_imperial_cosmetic_tag_fascism:0 "Southeastern Zebrican Empire"
+ ROA_imperial_cosmetic_tag_fascism_DEF:0 "Southeastern Zebrican Empire"
  ROA_imperial_cosmetic_tag_fascism_ADJ:0 "Roaman"

localisation/english/country_Chisimbi_l_english.yml

@@ -145,7 +145,7 @@ develop_eye_of_the_storm_crystals4:0 "Still More Crystals in Eye of the Storm"
 develop_thunder_cliffs_chromium:0 "Thunder Cliffs Chromium Exploitation"
 develop_zumbo_oil:0 "Wellspring Oil Wells"
 develop_muromo_werwizi_rubber:0 "Muromo Werwizi Rubber Plantations"
-develop_plisa_tungsten:0 "Plissa Mine Expansion"
+develop_plissa_tungsten:0 "Plissa Mine Expansion"
 
 GRW_internal_affairs:0 "Internal Affairs"
 GRW_move_capital_Sydia:0 "Move capital to Sydia"