Merge branch 'general-dev' of https://github.com/EaW-Team/equestria_dev into general-dev

Author: AzraelSilves

common/factions/goals/eaw_faction_goals_short_term.txt

@@ -389,6 +389,108 @@ faction_goal_topple_skyfall = {
 	}
 }
 
+faction_goal_unite_east_zebricans = {
+	
+	name = faction_goal_unite_east_zebricans_name
+	description = faction_goal_unite_east_zebricans_desc
+	category = short_term
+	group = FOCUS_FILTER_ANNEXATION
+	visible = {
+		ROOT = {
+			OR = {
+				original_tag = ROA
+				original_tag = ZLU
+				original_tag = IBZ
+				original_tag = TSV
+				original_tag = GFS
+				original_tag = GIF
+				original_tag = ZOO
+				original_tag = TAI
+				original_tag = MEL
+				original_tag = MQA
+				original_tag = IST
+				original_tag = IDO
+				original_tag = DEL
+			}
+		}
+	}
+	completed = {
+		ROA = {
+			all_core_state = {
+				is_controlled_by_ROOT_or_ally = yes
+			}
+		}
+		ZLU = {
+			all_core_state = {
+				is_controlled_by_ROOT_or_ally = yes
+			}
+		}
+		IBZ = {
+			all_core_state = {
+				is_controlled_by_ROOT_or_ally = yes
+			}
+		}
+		TSV = {
+			all_core_state = {
+				is_controlled_by_ROOT_or_ally = yes
+			}
+		}
+		GFS = {
+			all_core_state = {
+				is_controlled_by_ROOT_or_ally = yes
+			}
+		}
+		GIF = {
+			all_core_state = {
+				is_controlled_by_ROOT_or_ally = yes
+			}
+		}
+		ZOO = {
+			all_core_state = {
+				is_controlled_by_ROOT_or_ally = yes
+			}
+		}
+		TAI = {
+			all_core_state = {
+				is_controlled_by_ROOT_or_ally = yes
+			}
+		}
+		MEL = {
+			all_core_state = {
+				is_controlled_by_ROOT_or_ally = yes
+			}
+		}
+		MQA = {
+			all_core_state = {
+				is_controlled_by_ROOT_or_ally = yes
+			}
+		}
+		IST = {
+			all_core_state = {
+				is_controlled_by_ROOT_or_ally = yes
+			}
+		}
+		IDO = {
+			all_core_state = {
+				is_controlled_by_ROOT_or_ally = yes
+			}
+		}
+		DEL = {
+			all_core_state = {
+				is_controlled_by_ROOT_or_ally = yes
+			}
+		}
+	}
+	complete_effect = {
+		add_faction_power_projection = 125
+		custom_effect_tooltip = THE_FACTION_LEADER
+		add_stability = 0.02
+	}
+	ai_will_do = {
+		base = 1
+	}
+}
+
 ########### GENERIC SHORT TERM GOALS - DELETE IF PARADOX ADDS SOMETHING TO THIS EFFECT ###########
 
 

gfx/interface/grand_battleplan_bg.dds

@@ -5,7 +5,7 @@ state={
 	resources={
 		steel=8
 		tungsten=3
-		coal = 1
+		coal = 5
 	}
 	history={
 		owner = ZOO

gfx/interface/mob_warfare_bg.dds

@@ -107,6 +107,8 @@
  faction_goal_topple_aquileia_desc:0 "Our alliance was formed to secure ourselves against an Aquileian attack. We will only be secure once we have overthrown their regime."
  faction_goal_topple_skyfall_name:0 "Topple Skyfall"
  faction_goal_topple_skyfall_desc:0 "Our alliance was formed to combine our powers against the might of Skyfall. To overthrow their regime should be our immediate priority."
+ faction_goal_unite_east_zebricans_name:0 "Unite East-Zebricans"
+ faction_goal_unite_east_zebricans_desc:0 "Our alliance was formed to aid in the unification of the East-Zebrican Zebras and to provide mutual protection in these efforts."
  # genericos
  faction_goal_mechanize_our_army_name:0 "Mechanize Our Army"
  faction_goal_mechanize_our_army_desc:0 "The introduction of infantry fighting vehincles has the potential to greatly enhance the protection of our soldiers."

gfx/interface/sup_firepower_bg.dds

@@ -799,4 +799,8 @@
 
  #doctrines_l
  SUBDOCTRINE_COASTAL_AIR_PATROL_DESC: "Traditional sea-level means of coastal defense are ponypower-intensive and inefficient. Aerial mobility means we can keep an eye on friendly shores and punish any would-be invader."
- SUBDOCTRINE_BROAD_NAVAL_SUPPORT_DESC: "With reconnaissance, air superiority, and strike capability all in one package, carriers are an invaluable Jack-of-all-trades tool in the [ROOT.GetHands] of the task force commander."
+ SUBDOCTRINE_BROAD_NAVAL_SUPPORT_DESC: "With reconnaissance, air superiority, and strike capability all in one package, carriers are an invaluable Jack-of-all-trades tool in the [ROOT.GetHands] of the task force commander."
+ GRAND_DOCTRINE_MOBILE_WARFARE_DESC: "Hit them where they don't expect - mobile warfare doctrine seeks to break the trench deadlock of the Falcor War via aggressive maneuvers to pre-empt and disrupt the enemy."
+ GRAND_DOCTRINE_SUPERIOR_FIREPOWER_DESC: "Send shells, not bodies - Superior Firepower emphasizes employing crushing masses of fire to pave the way for maneuver units to advance and capture territory."
+ SUBDOCTRINE_CARRIER_AIRFIELDS_DESC: "A carrier deck is the most expensive piece of real estate on the world. No effort must be spared in eking out the maximum abount of possible air power from it."
+ SUBDOCTRINE_NIGHT_BOMBING_DESC: "Contrary to some theorists, the bomber does not, in fact, always get through. Flying at night reduces our accuracy, but vastly improves the survival rate of our planes and crews."

history/states/1135-Zmpangu.txt

@@ -852,6 +852,10 @@ operation_infiltrate_armed_forces_airforce_desc:0 "§L[From.getAdjective]ие В
  #doctrines_l
  SUBDOCTRINE_COASTAL_AIR_PATROL_DESC: "Оборона побережья непосредственно у воды – неэффективный и затратный метод. Быстрые и подвижные самолеты способны лучше прикрывать берега от захватчиков."
  SUBDOCTRINE_BROAD_NAVAL_SUPPORT_DESC: "Авианосцы – это разведка, господство в воздухе и возможность наносить авиаудары. Под началом умелых командиров соединений эти универсальные корабли становятся незаменимыми."
+ GRAND_DOCTRINE_MOBILE_WARFARE_DESC: "Нанесите удар там, где они не ждут. Доктрина маневренной войны направлена на преодоление окопного застоя Фалькорской войны и включает в себя стремительное передвижение с целью упреждения и дезорганизации действий противника."
+ GRAND_DOCTRINE_SUPERIOR_FIREPOWER_DESC: "Воюйте снарядами, а не солдатами. Используйте превосходящую огневую мощь, чтобы нанести сокрушительный удар по врагу и помочь маневренным подразделениям продвинуться вперед и захватить территорию противника."
+ SUBDOCTRINE_CARRIER_AIRFIELDS_DESC: "Самая дорогая собственность на планете — это палуба авианосца. На то, чтобы заполнить ее мощной авиацией, не следует жалеть никаких сил и средств."
+ SUBDOCTRINE_NIGHT_BOMBING_DESC: "Многие теоретики ошибались: бомбардировщик не всегда способен пробиться к цели. Ночные бомбардировки менее точны, зато самолеты и экипажи гораздо чаще возвращаются с заданий."
 
  #tank_modules
  super_heavy_tank_artillery_chassis: "Сверхтяжёлая САУ"

localisation/english/eaw_factions_l_english.yml

@@ -108,6 +108,8 @@
  faction_goal_topple_aquileia_desc:0 "Наш союз был создан, чтобы защитить себя от нападения Аквелии. Мы будем в безопасности лишь тогда, когда их режим будет свергнут."
  faction_goal_topple_skyfall_name:0 "Свергнуть Скайфол"
  faction_goal_topple_skyfall_desc:0 "Наш союз был создан, чтобы объединить силы против могущества Скайфола. Свержение их режима должно стать нашей первоочередной задачей."
+ faction_goal_unite_east_zebricans_name:0 "Объединить восточных зебр"
+ faction_goal_unite_east_zebricans_desc:0 "Наш союз создан для того, чтобы объединить зебр Восточной Зебрики и обеспечить взаимную защиту на этом пути."
  # genericos
  faction_goal_mechanize_our_army_name:0 "Механизировать армию"
  faction_goal_mechanize_our_army_desc:0 "Внедрение боевых машин пехоты поможет эффективно защитить наших солдат."