Modified addCommunitCoupBranch focuses in accordance with post 1083

Vic2ToHoI4/Data_Files/blankMod/output/localisation/focus2_l_braz_por.yml

@@ -15,6 +15,9 @@
  hardfought_market_focus_desc:0 "Sem um governo corrupto, apenas os melhores fabricantes podem vender seus produtos. A verdadeira competição leva à máxima eficiência."
  army_provides_focus:0 "O exército fornece"
  army_provides_focus_desc:0 "A necessidade de nossa indústria de mão-de-obra pode variar. O exército é um provedor constante para seus soldados trabalhadores e suas famílias."
+ Home_of_Revolution:0 "Casa da Revolução"
+ Influence_:0 "Influenciar a $TARGET"
+ Coup_:0 "Guerra civil na $TARGET"
  WarProp:0 "Propaganda de Guerra"
  PrepInter:0 "Prepare Intervenção"
  Lim:0 "Intervenção Limitada"

Vic2ToHoI4/Data_Files/blankMod/output/localisation/focus2_l_english.yml

@@ -15,6 +15,9 @@
  hardfought_market_focus_desc:0 "Without a corrupt government only the best manufacturers can sell their products. True competition leads to maximum efficiency."
  army_provides_focus:0 "The Army Provides"
  army_provides_focus_desc:0 "The need of our industry for manpower may vary. The army is a constant provider for their hard-working soldiers and their families."
+ Home_of_Revolution:0 "Home of the Revolution"
+ Influence_:0 "Influence $TARGET"
+ Coup_:0 "Civil War in $TARGET"
  WarProp:0 "War Propaganda"
  PrepInter:0 "Prepare Intervention"
  Lim:0 "Limited Intervention"

Vic2ToHoI4/Data_Files/blankMod/output/localisation/focus2_l_french.yml

@@ -15,6 +15,9 @@
  hardfought_market_focus_desc:0 "Sans un gouvernement corrompu, seuls les meilleurs fabricants peuvent vendre leurs produits. Une véritable concurrence conduit à une efficacité maximale."
  army_provides_focus:0 "L'armée fournit"
  army_provides_focus_desc:0 "Les besoins de notre industrie en main-d'œuvre peuvent varier. L'armée est un fournisseur constant pour leurs soldats qui travaillent dur et leurs familles."
+ Home_of_Revolution:0 "Maison de la Révolution"
+ Influence_:0 "Influence $TARGET"
+ Coup_:0 "Guerre civile en $TARGET"
  WarProp:0 "Propagande de guerre"
  PrepInter:0 "Préparer l'intervention"
  Lim:0 "Intervention limitée"

Vic2ToHoI4/Data_Files/blankMod/output/localisation/focus2_l_german.yml

@@ -15,6 +15,9 @@
  hardfought_market_focus_desc:0 "Ohne eine korrupte Regierung können nur die besten Hersteller ihre Produkte verkaufen. Wahrer Wettbewerb führt zu maximaler Effizienz."
  army_provides_focus:0 "Die Armee versorgt"
  army_provides_focus_desc:0 "Der Personalbedarf unser Industrie mag schwanken. Die Armee ist ein stetiger Versorger für ihre fleißigen Soldaten und deren Familien."
+ Home_of_Revolution:0 "Heimat der Revolution"
+ Influence_:0 "Einfluss auf $TARGET"
+ Coup_:0 "Bürgerkrieg in $TARGET"
  WarProp:0 "Kriegspropaganda"
  PrepInter:0 "Vorbereitung Intervention"
  Lim:0 "Eingeschränkte Intervention"

Vic2ToHoI4/Data_Files/blankMod/output/localisation/focus2_l_polish.yml

@@ -15,6 +15,9 @@
  hardfought_market_focus_desc:0 "Bez skorumpowanego rządu tylko najlepsi producenci mogą sprzedawać swoje produkty. Prawdziwa konkurencja prowadzi do maksymalnej wydajności."
  army_provides_focus:0 "Armia zapewnia"
  army_provides_focus_desc:0 "Potrzeba naszej branży dla siły roboczej może być różna. Armia jest stałym dostawcą dla ich ciężko pracujących żołnierzy i ich rodzin."
+ Home_of_Revolution:0 "Dom rewolucji"
+ Influence_:0 "Wpłyń na $TARGET"
+ Coup_:0 "Wojna domowa w $TARGET"
  WarProp:0 "Propaganda wojenna"
  PrepInter:0 "Przygotuj interwencję"
  Lim:0 "Ograniczona interwencja"

Vic2ToHoI4/Data_Files/blankMod/output/localisation/focus2_l_russian.yml

@@ -15,6 +15,9 @@
  hardfought_market_focus_desc:0 "Без коррумпированного правительства только лучшие производители могут продавать свою продукцию. Истинное соревнование приводит к максимальной эффективности."
  army_provides_focus:0 "Армия обеспечивает"
  army_provides_focus_desc:0 "Потребность нашей промышленности в рабочей силе может быть разной. Армия является постоянным поставщиком своих трудолюбивых солдат и их семей."
+ Home_of_Revolution:0 "Дом революции"
+ Influence_:0 "Влияние $TARGET"
+ Coup_:0 "Гражданская война в $TARGET"
  WarProp:0 "Пропаганда войны"
  PrepInter:0 "Подготовьте вмешательство"
  Lim:0 "Ограниченное вмешательство"

Vic2ToHoI4/Data_Files/blankMod/output/localisation/focus2_l_spanish.yml

@@ -15,6 +15,9 @@
  hardfought_market_focus_desc:0 "Sin un gobierno corrupto, solo los mejores fabricantes pueden vender sus productos. Sólo la verdadera competencia conduce a la máxima eficiencia."
  army_provides_focus:0 "El ejército proveerá"
  army_provides_focus_desc:0 "La necesidad de nuestra industria de mano de obra puede variar. El ejército es un proveedor constante para sus trabajadores soldados y sus familias."
+ Home_of_Revolution:0 "Inicio de la Revolución"
+ Influence_:0 "Influencia $TARGET"
+ Coup_:0 "Guerra civil en $TARGET"
  WarProp:0 "Propaganda de guerra"
  PrepInter:0 "Preparar la intervención"
  Lim:0 "Intervención limitada"

Vic2ToHoI4/Data_Files/converterFocuses.txt

@@ -576,4 +576,43 @@ focus = {
 			modifier = {
 			}
 		}
+	}
+
+	focus = {
+		id = Home_of_Revolution
+		icon = GFX_goal_support_communism
+		text = "Home of the Revolution"
+		x = 24
+		y = 0
+		cost = 10
+		completion_reward = {
+			add_ideas = communist_influence
+		}
+		ai_will_do = {
+			factor = 5
+		}
+	}
+
+	focus = {
+		id = Influence_
+		icon = GFX_goal_generic_propaganda
+		prerequisite = { focus = Home_of_Revolution }
+		x = 0
+		y = 1
+		relative_position_id = Home_of_Revolution
+		cost = 10
+		ai_will_do = {
+			factor = 5
+		}
+	}
+
+	focus = {
+		id = Coup_
+		icon = GFX_goal_generic_demand_territory
+		x = 0
+		y = 1
+		cost = 10
+		ai_will_do = {
+			factor = 5
+		}
 	}

Vic2ToHoI4/Source/HOI4World/HoI4FocusTree.cpp

@@ -1315,18 +1315,7 @@ void HoI4FocusTree::addCommunistCoupBranch(shared_ptr<HoI4Country> Home, const v
 	if (coupTargets.size() > 0)
 	{
 		//Focus to increase Comm support and prereq for coupTargets
-		shared_ptr<HoI4Focus> newFocus = make_shared<HoI4Focus>();
-		newFocus->id = "Home_of_Revolution" + Home->getTag();
-		newFocus->icon = "GFX_goal_support_communism";
-		newFocus->text = "Home of the Revolution";
-		newFocus->xPos = nextFreeColumn + coupTargets.size() - 1;
-		newFocus->yPos = 0;
-		newFocus->cost = 10;
-		newFocus->aiWillDo = "			factor = 5";
-		//FIXME 
-		//Need to get Drift Defense to work
-		//newFocus->completionReward += "			drift_defence_factor = 0.5\n";
-		newFocus->completionReward += "			add_ideas = communist_influence";
+		shared_ptr<HoI4Focus> newFocus = loadedFocuses.find("Home_of_Revolution")->second.makeCustomizedCopy(Home->getTag());
 		focuses.push_back(newFocus);
 
 		for (unsigned int i = 0; i < 2; i++)
@@ -1345,17 +1334,9 @@ void HoI4FocusTree::addCommunistCoupBranch(shared_ptr<HoI4Country> Home, const v
 					coupCountryName = "";
 				}
 
-				newFocus = make_shared<HoI4Focus>();
+				newFocus = loadedFocuses.find("Influence_")->second.makeCustomizedCopy(Home->getTag());
 				newFocus->id = "Influence_" + coupTargets[i]->getTag() + "_" + Home->getTag();
-				newFocus->icon = "GFX_goal_generic_propaganda";
 				newFocus->text = "Influence " + coupCountryName;
-				newFocus->prerequisites.push_back("= { focus = Home_of_Revolution" + Home->getTag() + " }");
-				newFocus->xPos = nextFreeColumn + i * 2;
-				newFocus->yPos = 1;
-				newFocus->cost = 10;
-				newFocus->aiWillDo += "= {\n";
-				newFocus->aiWillDo += "			factor = 5\n";
-				newFocus->aiWillDo += "		}";
 				newFocus->completionReward += "= {\n";
 				newFocus->completionReward += "			" + coupTargets[i]->getTag() + " = {\n";
 				newFocus->completionReward += "				if = {\n";
@@ -1388,18 +1369,12 @@ void HoI4FocusTree::addCommunistCoupBranch(shared_ptr<HoI4Country> Home, const v
 				focuses.push_back(newFocus);
 
 				//Civil War
-				newFocus = make_shared<HoI4Focus>();
+				newFocus = loadedFocuses.find("Coup_")->second.makeCustomizedCopy(Home->getTag());
 				newFocus->id = "Coup_" + coupTargets[i]->getTag() + "_" + Home->getTag();
-				newFocus->icon = "GFX_goal_generic_demand_territory";
 				newFocus->text = "Civil War in " + coupCountryName;
 				newFocus->prerequisites.push_back("= { focus = Influence_" + coupTargets[i]->getTag() + "_" + Home->getTag() + " }");
+				newFocus->relativePositionId = "Influence_" + coupTargets[i]->getTag() + "_" + Home->getTag();
 				newFocus->available = "			" + coupTargets[i]->getTag() + " = { communism > 0.5 }";
-				newFocus->xPos = nextFreeColumn + i * 2;
-				newFocus->yPos = 2;
-				newFocus->cost = 10;
-				newFocus->aiWillDo += "= {\n";
-				newFocus->aiWillDo += "			factor = 5\n";
-				newFocus->aiWillDo += "		}";
 				newFocus->completionReward += "= {\n";
 				newFocus->completionReward += "			" + coupTargets[i]->getTag() + " = {\n";
 				newFocus->completionReward += "				start_civil_war = {\n";