From f4306eecc345137d626dc7c6be73fc7a69072e83 Mon Sep 17 00:00:00 2001
From: Hamiller78 <Kneesch@gmx.de>
Date: Tue, 7 Feb 2017 21:55:06 +0100
Subject: [PATCH 1/3] Correction of two foci with wrong prerequisites ingeneric
 focus tree.

---
 Vic2ToHoI4/Source/HOI4World/HoI4FocusTree.cpp | 8724 ++++++++---------
 1 file changed, 4361 insertions(+), 4363 deletions(-)

diff --git a/Vic2ToHoI4/Source/HOI4World/HoI4FocusTree.cpp b/Vic2ToHoI4/Source/HOI4World/HoI4FocusTree.cpp
index 20d81de0b..4dd30b068 100644
--- a/Vic2ToHoI4/Source/HOI4World/HoI4FocusTree.cpp
+++ b/Vic2ToHoI4/Source/HOI4World/HoI4FocusTree.cpp
@@ -1,4364 +1,4362 @@
-/*Copyright (c) 2016 The Paradox Game Converters Project
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*/
-
-
-
-#include "HoI4FocusTree.h"
-#include "HoI4Country.h"
-#include "HoI4Focus.h"
-#include "../Configuration.h"
-#include "Log.h"
-#include "Object.h"
-#include "OSCompatibilityLayer.h"
-#include "ParadoxParserUTF8.h"
-#include <fstream>
-using namespace std;
-
-
-
-HoI4FocusTree::HoI4FocusTree()
-{
-}
-
-
-HoI4FocusTree::HoI4FocusTree(const HoI4Country* country)
-{
-	srcCountryTag = country->getSourceCountry()->getTag();
-	dstCountryTag = country->getTag();
-}
-
-
-void HoI4FocusTree::addGenericFocusTree()
-{
-/*	Object2* genericObj = processFile(Configuration::getHoI4Path() + "/common/national_focus/generic.txt");
-	vector<Object2*> focusTreeLeaves = genericObj->getLeaves();
-	vector<Object2*> focusObjects = focusTreeLeaves[0]->getValue("focus");
-	for (auto focusObject: focusObjects)
-	{
-		HoI4Focus* newFocus = new HoI4Focus(focusObject);
-		focuses.push_back(newFocus);
-	}*/
-
-	if (Configuration::getHOI4Version() >= HOI4Version("1.3.0"))
-	{
-		addVersion1_3GenericFocusTree();
-	}
-	else
-	{
-		addVersion1_0GenericFocusTree();
-	}
-}
-
-
-void HoI4FocusTree::addVersion1_0GenericFocusTree()
-{
-	HoI4Focus* newFocus = new HoI4Focus;
-	newFocus->id = "army_effort";
-	newFocus->icon = "GFX_goal_generic_allies_build_infantry";
-	newFocus->xPos = 1;
-	newFocus->yPos = 0;
-	newFocus->cost = 10;
-	newFocus->completionReward =  "			army_experience = 5\n";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = land_doc_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = land_doctrine\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "equipment_effort";
-	newFocus->icon = "GFX_goal_generic_small_arms";
-	newFocus->prerequisites.push_back("focus = army_effort");
-	newFocus->xPos = 0;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->completionReward =  "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = infantry_weapons_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = infantry_weapons\n";
-	newFocus->completionReward += "				category = artillery\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "motorization_effort";
-	newFocus->icon = "GFX_goal_generic_army_motorized";
-	newFocus->prerequisites.push_back("focus = army_effort");
-	newFocus->bypass = "			has_tech = motorised_infantry";
-	newFocus->xPos = 2;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->completionReward =  "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = motorized_bonus\n";
-	newFocus->completionReward += "				bonus = 0.75\n";
-	newFocus->completionReward += "				technology = motorised_infantry\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "doctrine_effort";
-	newFocus->icon = "GFX_goal_generic_army_doctrines";
-	newFocus->prerequisites.push_back("focus = army_effort");
-	newFocus->xPos = 1;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->completionReward  = "			army_experience = 5\n";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = land_doc_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = land_doctrine\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "equipment_effort_2";
-	newFocus->icon = "GFX_goal_generic_army_artillery";
-	newFocus->prerequisites.push_back("focus = equipment_effort");
-	newFocus->xPos = 0;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->completionReward  = "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = infantry_artillery_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = infantry_weapons\n";
-	newFocus->completionReward += "				category = artillery\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "mechanization_effort";
-	newFocus->icon = "GFX_goal_generic_build_tank";
-	newFocus->prerequisites.push_back("focus = motorization_effort");
-	newFocus->xPos = 2;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->completionReward  = "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = motorized_bonus\n";
-	newFocus->completionReward += "				ahead_reduction = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = motorized_equipment\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "doctrine_effort_2";
-	newFocus->icon = "GFX_goal_generic_army_doctrines";
-	newFocus->prerequisites.push_back("focus = doctrine_effort");
-	newFocus->xPos = 1;
-	newFocus->yPos = 4;
-	newFocus->cost = 10;
-	newFocus->completionReward  = "			army_experience = 5\n";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = land_doc_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = land_doctrine\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "equipment_effort_3";
-	newFocus->icon = "GFX_goal_generic_army_artillery2";
-	newFocus->prerequisites.push_back("focus = equipment_effort_2");
-	newFocus->xPos = 0;
-	newFocus->yPos = 5;
-	newFocus->cost = 10;
-	newFocus->completionReward  = "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = infantry_artillery_bonus\n";
-	newFocus->completionReward += "				ahead_reduction = 1\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = infantry_weapons\n";
-	newFocus->completionReward += "				category = artillery\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "armor_effort";
-	newFocus->icon = "GFX_goal_generic_army_tanks";
-	newFocus->prerequisites.push_back("focus = mechanization_effort");
-	newFocus->xPos = 2;
-	newFocus->yPos = 5;
-	newFocus->cost = 10;
-	newFocus->completionReward  = "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = armor_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 2\n";
-	newFocus->completionReward += "				category = armor\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "special_forces";
-	newFocus->icon = "GFX_goal_generic_special_forces";
-	newFocus->prerequisites.push_back("focus = equipment_effort_3");
-	newFocus->prerequisites.push_back("focus = doctrine_effort_2");
-	newFocus->prerequisites.push_back("focus = armor_effort");
-	newFocus->xPos = 1;
-	newFocus->yPos = 6;
-	newFocus->cost = 10;
-	newFocus->completionReward  = "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = special_forces_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				technology = paratroopers\n";
-	newFocus->completionReward += "				technology = paratroopers2\n";
-	newFocus->completionReward += "				technology = marines\n";
-	newFocus->completionReward += "				technology = marines2\n";
-	newFocus->completionReward += "				technology = tech_mountaineers\n";
-	newFocus->completionReward += "				technology = tech_mountaineers2\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "aviation_effort";
-	newFocus->icon = "GFX_goal_generic_build_airforce";
-	newFocus->xPos = 5;
-	newFocus->yPos = 0;
-	newFocus->cost = 10;
-	newFocus->completeTooltip  = "			air_experience = 25\n";
-	newFocus->completeTooltip += "			if = { limit = { has_country_flag = aviation_effort_AB }\n";
-	newFocus->completeTooltip += "				add_building_construction = {\n";
-	newFocus->completeTooltip += "					type = air_base\n";
-	newFocus->completeTooltip += "					level = 2\n";
-	newFocus->completeTooltip += "					instant_build = yes\n";
-	newFocus->completeTooltip += "				}\n";
-	newFocus->completeTooltip += "			}			\n";
-	newFocus->completeTooltip += "			add_tech_bonus = {\n";
-	newFocus->completeTooltip += "				name = air_doc_bonus\n";
-	newFocus->completeTooltip += "				bonus = 0.5\n";
-	newFocus->completeTooltip += "				uses = 1\n";
-	newFocus->completeTooltip += "				category = air_doctrine\n";
-	newFocus->completeTooltip += "			}			";
-	newFocus->completionReward += "			air_experience = 25\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					capital_scope = {\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							free_building_slots = {\n";
-	newFocus->completionReward += "								building = air_base\n";
-	newFocus->completionReward += "								size > 1\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				random_owned_state = {\n";
-	newFocus->completionReward += "					limit = {\n";
-	newFocus->completionReward += "						free_building_slots = {\n";
-	newFocus->completionReward += "							building = air_base\n";
-	newFocus->completionReward += "							size > 1\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					add_building_construction = {\n";
-	newFocus->completionReward += "						type = air_base\n";
-	newFocus->completionReward += "						level = 2\n";
-	newFocus->completionReward += "						instant_build = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					ROOT = { set_country_flag = aviation_effort_AB }\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					capital_scope = {\n";
-	newFocus->completionReward += "						free_building_slots = {\n";
-	newFocus->completionReward += "							building = air_base\n";
-	newFocus->completionReward += "							size > 1\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				capital_scope = {\n";
-	newFocus->completionReward += "					add_building_construction = {\n";
-	newFocus->completionReward += "						type = air_base\n";
-	newFocus->completionReward += "						level = 2\n";
-	newFocus->completionReward += "						instant_build = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					ROOT = { set_country_flag = aviation_effort_AB }\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = air_doc_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = air_doctrine\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "fighter_focus";
-	newFocus->icon = "GFX_goal_generic_air_fighter";
-	newFocus->prerequisites.push_back("focus = aviation_effort");
-	newFocus->mutuallyExclusive = "focus = bomber_focus";
-	newFocus->xPos = 4;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = fighter_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 2\n";
-	newFocus->completionReward += "				technology = early_fighter\n";
-	newFocus->completionReward += "				technology = fighter1\n";
-	newFocus->completionReward += "				technology = fighter2\n";
-	newFocus->completionReward += "				technology = fighter3\n";
-	newFocus->completionReward += "				technology = heavy_fighter1\n";
-	newFocus->completionReward += "				technology = heavy_fighter2\n";
-	newFocus->completionReward += "				technology = heavy_fighter3\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "bomber_focus";
-	newFocus->icon = "GFX_goal_generic_air_bomber";
-	newFocus->prerequisites.push_back("focus = aviation_effort");
-	newFocus->mutuallyExclusive = "focus = fighter_focus";
-	newFocus->xPos = 6;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = bomber_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 2\n";
-	newFocus->completionReward += "				technology = strategic_bomber1\n";
-	newFocus->completionReward += "				technology = strategic_bomber2\n";
-	newFocus->completionReward += "				technology = strategic_bomber3\n";
-	newFocus->completionReward += "				category = tactical_bomber\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "aviation_effort_2";
-	newFocus->icon = "GFX_goal_generic_air_doctrine";
-	newFocus->prerequisites.push_back("focus = bomber_focus focus = fighter_focus");
-	newFocus->xPos = 5;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->completeTooltip += "			air_experience = 25\n";
-	newFocus->completeTooltip += "			if = { limit = { has_country_flag = aviation_effort_2_AB }\n";
-	newFocus->completeTooltip += "				add_building_construction = {\n";
-	newFocus->completeTooltip += "					type = air_base\n";
-	newFocus->completeTooltip += "					level = 2\n";
-	newFocus->completeTooltip += "					instant_build = yes\n";
-	newFocus->completeTooltip += "				}\n";
-	newFocus->completeTooltip += "			}\n";
-	newFocus->completeTooltip += "			add_tech_bonus = {\n";
-	newFocus->completeTooltip += "				name =  air_doc_bonus\n";
-	newFocus->completeTooltip += "				bonus = 0.5\n";
-	newFocus->completeTooltip += "				uses = 1\n";
-	newFocus->completeTooltip += "				category = air_doctrine\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			air_experience = 25\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					capital_scope = {\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							free_building_slots = {\n";
-	newFocus->completionReward += "								building = air_base\n";
-	newFocus->completionReward += "								size > 1\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				random_owned_state = {\n";
-	newFocus->completionReward += "					limit = {\n";
-	newFocus->completionReward += "						free_building_slots = {\n";
-	newFocus->completionReward += "							building = air_base\n";
-	newFocus->completionReward += "							size > 1\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					add_building_construction = {\n";
-	newFocus->completionReward += "						type = air_base\n";
-	newFocus->completionReward += "						level = 2\n";
-	newFocus->completionReward += "						instant_build = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					ROOT = { set_country_flag = aviation_effort_2_AB }\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					capital_scope = {\n";
-	newFocus->completionReward += "						free_building_slots = {\n";
-	newFocus->completionReward += "							building = air_base\n";
-	newFocus->completionReward += "							size > 1\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				capital_scope = {\n";
-	newFocus->completionReward += "					add_building_construction = {\n";
-	newFocus->completionReward += "						type = air_base\n";
-	newFocus->completionReward += "						level = 2\n";
-	newFocus->completionReward += "						instant_build = yes\n";
-	newFocus->completionReward += "					}				\n";
-	newFocus->completionReward += "					ROOT = { set_country_flag = aviation_effort_2_AB }\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name =  air_doc_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = air_doctrine\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "CAS_effort";
-	newFocus->icon = "GFX_goal_generic_CAS";
-	newFocus->prerequisites.push_back("focus = aviation_effort_2");
-	newFocus->prerequisites.push_back("focus = motorization_effort");
-	newFocus->xPos = 4;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = CAS_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				ahead_reduction = 1\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = cas_bomber\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "rocket_effort";
-	newFocus->icon = "GFX_focus_rocketry";
-	newFocus->prerequisites.push_back("focus = aviation_effort_2");
-	newFocus->prerequisites.push_back("focus = infrastructure_effort");
-	newFocus->xPos = 5;
-	newFocus->yPos = 4;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = jet_rocket_bonus\n";
-	newFocus->completionReward += "				ahead_reduction = 0.5\n";
-	newFocus->completionReward += "				uses = 2\n";
-	newFocus->completionReward += "				category = rocketry\n";
-	newFocus->completionReward += "				category = jet_technology\n";
-	newFocus->completionReward += "			}";
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0.25\n";
-	newFocus->aiWillDo += "				always = yes\n";
-	newFocus->aiWillDo += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "NAV_effort";
-	newFocus->icon = "GFX_goal_generic_air_naval_bomber";
-	newFocus->prerequisites.push_back("focus = aviation_effort_2");
-	newFocus->prerequisites.push_back("focus = flexible_navy");
-	newFocus->xPos = 6;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = nav_bomber_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				ahead_reduction = 1\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = naval_bomber\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "naval_effort";
-	newFocus->icon = "GFX_goal_generic_construct_naval_dockyard";
-	newFocus->xPos = 9;
-	newFocus->yPos = 0;
-	newFocus->cost = 10;
-	newFocus->available += "			any_state = {\n";
-	newFocus->available += "				is_coastal = yes\n";
-	newFocus->available += "				is_controlled_by = ROOT\n";
-	newFocus->available += "			}";
-	newFocus->completeTooltip += "			navy_experience = 25\n";
-	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 3\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = dockyard\n";
-	newFocus->completeTooltip += "				level = 3\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			navy_experience = 25\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					NOT = {\n";
-	newFocus->completionReward += "						any_owned_state = {\n";
-	newFocus->completionReward += "							dockyard > 0\n";
-	newFocus->completionReward += "							free_building_slots = {\n";
-	newFocus->completionReward += "								building = dockyard\n";
-	newFocus->completionReward += "								size > 2\n";
-	newFocus->completionReward += "								include_locked = yes\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					any_owned_state = {\n";
-	newFocus->completionReward += "						is_coastal = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				random_owned_state = {\n";
-	newFocus->completionReward += "					limit = {\n";
-	newFocus->completionReward += "						is_coastal = yes\n";
-	newFocus->completionReward += "						free_building_slots = {\n";
-	newFocus->completionReward += "							building = dockyard\n";
-	newFocus->completionReward += "							size > 2\n";
-	newFocus->completionReward += "							include_locked = yes\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					add_extra_state_shared_building_slots = 3\n";
-	newFocus->completionReward += "					add_building_construction = {\n";
-	newFocus->completionReward += "						type = dockyard\n";
-	newFocus->completionReward += "						level = 3\n";
-	newFocus->completionReward += "						instant_build = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				set_country_flag = naval_effort_built\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					NOT = { has_country_flag = naval_effort_built }\n";
-	newFocus->completionReward += "					any_owned_state = {\n";
-	newFocus->completionReward += "						dockyard > 0\n";
-	newFocus->completionReward += "						free_building_slots = {\n";
-	newFocus->completionReward += "							building = dockyard\n";
-	newFocus->completionReward += "							size > 2\n";
-	newFocus->completionReward += "							include_locked = yes\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				random_owned_state = {\n";
-	newFocus->completionReward += "					limit = {\n";
-	newFocus->completionReward += "						dockyard > 0\n";
-	newFocus->completionReward += "						free_building_slots = {\n";
-	newFocus->completionReward += "							building = dockyard\n";
-	newFocus->completionReward += "							size > 2\n";
-	newFocus->completionReward += "							include_locked = yes\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					add_extra_state_shared_building_slots = 3\n";
-	newFocus->completionReward += "					add_building_construction = {\n";
-	newFocus->completionReward += "						type = dockyard\n";
-	newFocus->completionReward += "						level = 3\n";
-	newFocus->completionReward += "						instant_build = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				set_country_flag = naval_effort_built\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					NOT = { has_country_flag = naval_effort_built }\n";
-	newFocus->completionReward += "					NOT = {\n";
-	newFocus->completionReward += "						any_owned_state = {\n";
-	newFocus->completionReward += "							free_building_slots = {\n";
-	newFocus->completionReward += "								building = dockyard\n";
-	newFocus->completionReward += "								size > 2\n";
-	newFocus->completionReward += "								include_locked = yes\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				random_state = {\n";
-	newFocus->completionReward += "					limit = {\n";
-	newFocus->completionReward += "						controller = { tag = ROOT }\n";
-	newFocus->completionReward += "						free_building_slots = {\n";
-	newFocus->completionReward += "							building = dockyard\n";
-	newFocus->completionReward += "							size > 2\n";
-	newFocus->completionReward += "							include_locked = yes\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					add_extra_state_shared_building_slots = 3\n";
-	newFocus->completionReward += "					add_building_construction = {\n";
-	newFocus->completionReward += "						type = dockyard\n";
-	newFocus->completionReward += "						level = 3\n";
-	newFocus->completionReward += "						instant_build = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "flexible_navy";
-	newFocus->icon = "GFX_goal_generic_build_navy";
-	newFocus->prerequisites.push_back("focus = naval_effort");
-	newFocus->mutuallyExclusive = "focus = large_navy";
-	newFocus->xPos = 8;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				all_owned_state = {\n";
-	newFocus->aiWillDo += "					OR = {\n";
-	newFocus->aiWillDo += "						is_coastal = no\n";
-	newFocus->aiWillDo += "						dockyard < 1\n";
-	newFocus->aiWillDo += "					}\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = sub_op_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 2\n";
-	newFocus->completionReward += "				technology = convoy_interdiction_ti\n";
-	newFocus->completionReward += "				technology = unrestricted_submarine_warfare\n";
-	newFocus->completionReward += "				technology = wolfpacks\n";
-	newFocus->completionReward += "				technology = advanced_submarine_warfare\n";
-	newFocus->completionReward += "				technology = combined_operations_raiding\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "large_navy";
-	newFocus->icon = "GFX_goal_generic_navy_doctrines_tactics";
-	newFocus->prerequisites.push_back("focus = naval_effort");
-	newFocus->mutuallyExclusive = "focus = flexible_navy";
-	newFocus->xPos = 10;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				all_owned_state = {\n";
-	newFocus->aiWillDo += "					OR = {\n";
-	newFocus->aiWillDo += "						is_coastal = no\n";
-	newFocus->aiWillDo += "						dockyard < 1\n";
-	newFocus->aiWillDo += "					}\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = fleet_in_being_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 2\n";
-	newFocus->completionReward += "				category = fleet_in_being_tree\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "submarine_effort";
-	newFocus->icon = "GFX_goal_generic_navy_submarine";
-	newFocus->prerequisites.push_back("focus = flexible_navy focus = large_navy");
-	newFocus->xPos = 8;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				all_owned_state = {\n";
-	newFocus->aiWillDo += "					OR = {\n";
-	newFocus->aiWillDo += "						is_coastal = no\n";
-	newFocus->aiWillDo += "						dockyard < 1\n";
-	newFocus->aiWillDo += "					}\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = ss_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				ahead_reduction = 1\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				technology = early_submarine\n";
-	newFocus->completionReward += "				technology = basic_submarine\n";
-	newFocus->completionReward += "				technology = improved_submarine\n";
-	newFocus->completionReward += "				technology = advanced_submarine\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "cruiser_effort";
-	newFocus->icon = "GFX_goal_generic_navy_cruiser";
-	newFocus->prerequisites.push_back("focus = large_navy focus = flexible_navy");
-	newFocus->xPos = 10;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				all_owned_state = {\n";
-	newFocus->aiWillDo += "					OR = {\n";
-	newFocus->aiWillDo += "						is_coastal = no\n";
-	newFocus->aiWillDo += "						dockyard < 1\n";
-	newFocus->aiWillDo += "					}\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = cr_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				ahead_reduction = 1\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				technology = improved_light_cruiser\n";
-	newFocus->completionReward += "				technology = advanced_light_cruiser\n";
-	newFocus->completionReward += "				technology = improved_heavy_cruiser\n";
-	newFocus->completionReward += "				technology = advanced_heavy_cruiser\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "destroyer_effort";
-	newFocus->icon = "GFX_goal_generic_wolf_pack";
-	newFocus->prerequisites.push_back("focus = submarine_effort");
-	newFocus->xPos = 8;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				all_owned_state = {\n";
-	newFocus->aiWillDo += "					OR = {\n";
-	newFocus->aiWillDo += "						is_coastal = no\n";
-	newFocus->aiWillDo += "						dockyard < 1\n";
-	newFocus->aiWillDo += "					}\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = dd_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				ahead_reduction = 1\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				technology = early_destroyer\n";
-	newFocus->completionReward += "				technology = basic_destroyer\n";
-	newFocus->completionReward += "				technology = improved_destroyer\n";
-	newFocus->completionReward += "				technology = advanced_destroyer\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "capital_ships_effort";
-	newFocus->icon = "GFX_goal_generic_navy_battleship";
-	newFocus->prerequisites.push_back("focus = cruiser_effort");
-	newFocus->xPos = 10;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				all_owned_state = {\n";
-	newFocus->aiWillDo += "					OR = {\n";
-	newFocus->aiWillDo += "						is_coastal = no\n";
-	newFocus->aiWillDo += "						dockyard < 1\n";
-	newFocus->aiWillDo += "					}\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			navy_experience = 25\n";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = capital_ships_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				ahead_reduction = 1\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				technology = basic_battlecruiser\n";
-	newFocus->completionReward += "				technology = basic_battleship\n";
-	newFocus->completionReward += "				technology = improved_battleship\n";
-	newFocus->completionReward += "				technology = advanced_battleship\n";
-	newFocus->completionReward += "				technology = heavy_battleship\n";
-	newFocus->completionReward += "				technology = heavy_battleship2\n";
-	newFocus->completionReward += "				technology = early_carrier\n";
-	newFocus->completionReward += "				technology = basic_carrier\n";
-	newFocus->completionReward += "				technology = improved_carrier\n";
-	newFocus->completionReward += "				technology = advanced_carrier\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "industrial_effort";
-	newFocus->icon = "GFX_goal_generic_production";
-	newFocus->xPos = 13;
-	newFocus->yPos = 0;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = industrial_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = industry\n";
-	newFocus->completionReward += "			}";
-	newFocus->aiWillDo += "			factor = 3\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				date < 1939.1.1\n";
-	newFocus->aiWillDo += "				OR = {\n";
-	newFocus->aiWillDo += "					# we also dont want tiny nations to go crazy with slots right away\n";
-	newFocus->aiWillDo += "					num_of_controlled_states < 2\n";
-	newFocus->aiWillDo += "				}				\n";
-	newFocus->aiWillDo += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "construction_effort";
-	newFocus->icon = "GFX_goal_generic_construct_civ_factory";
-	newFocus->prerequisites.push_back("focus = industrial_effort");
-	newFocus->xPos = 12;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 2";
-	newFocus->bypass += "			custom_trigger_tooltip = {\n";
-	newFocus->bypass += "				tooltip = construction_effort_tt\n";
-	newFocus->bypass += "				all_owned_state = {\n";
-	newFocus->bypass += "					free_building_slots = {\n";
-	newFocus->bypass += "						building = industrial_complex\n";
-	newFocus->bypass += "						size < 1\n";
-	newFocus->bypass += "						include_locked = yes\n";
-	newFocus->bypass += "					}					\n";
-	newFocus->bypass += "				}\n";
-	newFocus->bypass += "			}";
-	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = industrial_complex\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = industrial_complex\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = industrial_complex\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = industrial_complex\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "production_effort";
-	newFocus->icon = "GFX_goal_generic_construct_mil_factory";
-	newFocus->prerequisites.push_back("focus = industrial_effort");
-	newFocus->xPos = 14;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 2";
-	newFocus->bypass += "			custom_trigger_tooltip = {\n";
-	newFocus->bypass += "				tooltip = production_effort_tt\n";
-	newFocus->bypass += "				all_owned_state = {\n";
-	newFocus->bypass += "					free_building_slots = {\n";
-	newFocus->bypass += "						building = arms_factory\n";
-	newFocus->bypass += "						size < 1\n";
-	newFocus->bypass += "						include_locked = yes\n";
-	newFocus->bypass += "					}\n";
-	newFocus->bypass += "				}\n";
-	newFocus->bypass += "			}";
-	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = arms_factory\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = arms_factory\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = arms_factory\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = arms_factory\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "construction_effort_2";
-	newFocus->icon = "GFX_goal_generic_construct_civ_factory";
-	newFocus->prerequisites.push_back("focus = construction_effort");
-	newFocus->xPos = 12;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 2";
-	newFocus->bypass += "			custom_trigger_tooltip = {\n";
-	newFocus->bypass += "				tooltip = construction_effort_tt\n";
-	newFocus->bypass += "				all_owned_state = {\n";
-	newFocus->bypass += "					free_building_slots = {\n";
-	newFocus->bypass += "						building = industrial_complex\n";
-	newFocus->bypass += "						size < 1\n";
-	newFocus->bypass += "						include_locked = yes\n";
-	newFocus->bypass += "					}\n";
-	newFocus->bypass += "				}\n";
-	newFocus->bypass += "			}";
-	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = industrial_complex\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = industrial_complex\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = industrial_complex\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = industrial_complex\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "production_effort_2";
-	newFocus->icon = "GFX_goal_generic_construct_mil_factory";
-	newFocus->prerequisites.push_back("focus = production_effort");
-	newFocus->xPos = 14;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 2";
-	newFocus->bypass += "			custom_trigger_tooltip = {\n";
-	newFocus->bypass += "				tooltip = production_effort_tt\n";
-	newFocus->bypass += "				all_owned_state = {\n";
-	newFocus->bypass += "					free_building_slots = {\n";
-	newFocus->bypass += "						building = arms_factory\n";
-	newFocus->bypass += "						size < 1\n";
-	newFocus->bypass += "						include_locked = yes\n";
-	newFocus->bypass += "					}\n";
-	newFocus->bypass += "				}\n";
-	newFocus->bypass += "			}";
-	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = arms_factory\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = arms_factory\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = arms_factory\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = arms_factory\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "infrastructure_effort";
-	newFocus->icon = "GFX_goal_generic_construct_infrastructure";
-	newFocus->prerequisites.push_back("focus = construction_effort_2");
-	newFocus->xPos = 12;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->bypass += "			custom_trigger_tooltip = {\n";
-	newFocus->bypass += "				tooltip = infrastructure_effort_tt\n";
-	newFocus->bypass += "				all_owned_state = {			\n";
-	newFocus->bypass += "					free_building_slots = {\n";
-	newFocus->bypass += "						building = infrastructure\n";
-	newFocus->bypass += "						size < 1\n";
-	newFocus->bypass += "					}\n";
-	newFocus->bypass += "				}\n";
-	newFocus->bypass += "			}";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = infrastructure\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = infrastructure\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = infrastructure\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = infrastructure\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = infrastructure\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = infrastructure\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = infrastructure\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = infrastructure\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "production_effort_3";
-	newFocus->icon = "GFX_goal_generic_construct_mil_factory";
-	newFocus->prerequisites.push_back("focus = production_effort_2");
-	newFocus->xPos = 14;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 2";
-	newFocus->bypass += "			custom_trigger_tooltip = {\n";
-	newFocus->bypass += "				tooltip = production_effort_tt\n";
-	newFocus->bypass += "				all_owned_state = {\n";
-	newFocus->bypass += "					free_building_slots = {\n";
-	newFocus->bypass += "						building = arms_factory\n";
-	newFocus->bypass += "						size < 1\n";
-	newFocus->bypass += "						include_locked = yes\n";
-	newFocus->bypass += "					}\n";
-	newFocus->bypass += "				}\n";
-	newFocus->bypass += "			}";
-	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = arms_factory\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = arms_factory\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = arms_factory\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = arms_factory\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "infrastructure_effort_2";
-	newFocus->icon = "GFX_goal_generic_construct_infrastructure";
-	newFocus->prerequisites.push_back("focus = infrastructure_effort");
-	newFocus->xPos = 12;
-	newFocus->yPos = 4;
-	newFocus->cost = 10;
-	newFocus->bypass += "			custom_trigger_tooltip = {\n";
-	newFocus->bypass += "				tooltip = infrastructure_effort_tt\n";
-	newFocus->bypass += "				all_owned_state = {			\n";
-	newFocus->bypass += "					free_building_slots = {\n";
-	newFocus->bypass += "						building = infrastructure\n";
-	newFocus->bypass += "						size < 1\n";
-	newFocus->bypass += "					}\n";
-	newFocus->bypass += "				}\n";
-	newFocus->bypass += "			}";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = infrastructure\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = infrastructure\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = infrastructure\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = infrastructure\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = infrastructure\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = infrastructure\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = infrastructure\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = infrastructure\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "construction_effort_3";
-	newFocus->icon = "GFX_goal_generic_construct_civ_factory";
-	newFocus->prerequisites.push_back("focus = infrastructure_effort");
-	newFocus->xPos = 14;
-	newFocus->yPos = 4;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 2";
-	newFocus->bypass += "			custom_trigger_tooltip = {\n";
-	newFocus->bypass += "				tooltip = construction_effort_tt\n";
-	newFocus->bypass += "				all_owned_state = {\n";
-	newFocus->bypass += "					free_building_slots = {\n";
-	newFocus->bypass += "						building = industrial_complex\n";
-	newFocus->bypass += "						size < 2\n";
-	newFocus->bypass += "						include_locked = yes\n";
-	newFocus->bypass += "					}\n";
-	newFocus->bypass += "				}\n";
-	newFocus->bypass += "			}";
-	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 2\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = industrial_complex\n";
-	newFocus->completeTooltip += "				level = 2\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = industrial_complex\n";
-	newFocus->completionReward += "						size > 1\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = industrial_complex\n";
-	newFocus->completionReward += "										size > 1\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 2\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = industrial_complex\n";
-	newFocus->completionReward += "					level = 2\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "nuclear_effort";
-	newFocus->icon = "GFX_focus_wonderweapons";
-	newFocus->prerequisites.push_back("focus = infrastructure_effort_2");
-	newFocus->xPos = 10;
-	newFocus->yPos = 5;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = nuclear_bonus\n";
-	newFocus->completionReward += "				ahead_reduction = 0.5\n";
-	newFocus->completionReward += "				category = nuclear\n";
-	newFocus->completionReward += "			}";
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0.25\n";
-	newFocus->aiWillDo += "				always = yes\n";
-	newFocus->aiWillDo += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "extra_tech_slot";
-	newFocus->icon = "GFX_focus_research";
-	newFocus->prerequisites.push_back("focus = infrastructure_effort_2");
-	newFocus->xPos = 12;
-	newFocus->yPos = 5;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_research_slot = 1";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "extra_tech_slot_2";
-	newFocus->icon = "GFX_focus_research";
-	newFocus->prerequisites.push_back("focus = extra_tech_slot");
-	newFocus->available += "			num_of_factories > 50";
-	newFocus->cancelIfInvalid += "no";
-	newFocus->continueIfInvalid += "yes";
-	newFocus->xPos = 12;
-	newFocus->yPos = 6;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_research_slot = 1";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "secret_weapons";
-	newFocus->icon = "GFX_goal_generic_secret_weapon";
-	newFocus->prerequisites.push_back("focus = infrastructure_effort_2");
-	newFocus->xPos = 14;
-	newFocus->yPos = 5;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = secret_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 4\n";
-	newFocus->completionReward += "				category = electronics\n";
-	newFocus->completionReward += "				category = nuclear\n";
-	newFocus->completionReward += "				category = rocketry\n";
-	newFocus->completionReward += "			}";
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0.25\n";
-	newFocus->aiWillDo += "				always = yes\n";
-	newFocus->aiWillDo += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "political_effort";
-	newFocus->icon = "GFX_goal_generic_demand_territory";
-	newFocus->xPos = 19;
-	newFocus->yPos = 0;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_political_power = 120";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "collectivist_ethos";
-	newFocus->icon = "GFX_goal_generic_national_unity #icon = GFX_goal_tripartite_pact";
-	newFocus->prerequisites.push_back("focus = political_effort");
-	newFocus->mutuallyExclusive = "focus = liberty_ethos";
-	newFocus->available += "			OR = {\n";
-	newFocus->available += "				has_government = fascism\n";
-	newFocus->available += "				has_government = communism\n";
-	newFocus->available += "				has_government = neutrality\n";
-	newFocus->available += "			}";
-	newFocus->xPos = 18;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 5\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				OR = {\n";
-	newFocus->aiWillDo += "					is_historical_focus_on = yes\n";
-	newFocus->aiWillDo += "					has_idea = neutrality_idea\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_ideas = collectivist_ethos_focus";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "nationalism_focus";
-	newFocus->icon = "GFX_goal_support_fascism #icon = GFX_goal_tripartite_pact";
-	newFocus->prerequisites.push_back("focus = collectivist_ethos");
-	newFocus->mutuallyExclusive = "focus = internationalism_focus";
-	newFocus->available += "			OR = {\n";
-	newFocus->available += "				has_government = fascism\n";
-	newFocus->available += "				has_government = neutrality\n";
-	newFocus->available += "			}";
-	newFocus->xPos = 16;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 5\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 2\n";
-	newFocus->aiWillDo += "				any_neighbor_country = {\n";
-	newFocus->aiWillDo += "					is_major = yes\n";
-	newFocus->aiWillDo += "					has_government = fascism\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_ideas = nationalism";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "internationalism_focus";
-	newFocus->icon = "GFX_goal_support_communism #icon = GFX_goal_tripartite_pact";
-	newFocus->prerequisites.push_back("focus = collectivist_ethos");
-	newFocus->mutuallyExclusive = "focus = nationalism_focus";
-	newFocus->available += "			OR = {\n";
-	newFocus->available += "				has_government = communism\n";
-	newFocus->available += "				has_government = neutrality\n";
-	newFocus->available += "			}";
-	newFocus->xPos = 18;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 5\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 2\n";
-	newFocus->aiWillDo += "				any_neighbor_country = {\n";
-	newFocus->aiWillDo += "					is_major = yes\n";
-	newFocus->aiWillDo += "					has_government = communism\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_ideas = internationalism";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "liberty_ethos";
-	newFocus->icon = "GFX_goal_support_democracy";
-	newFocus->prerequisites.push_back("focus = political_effort");
-	newFocus->mutuallyExclusive = "focus = collectivist_ethos";
-	newFocus->available += "			OR = {\n";
-	newFocus->available += "				has_government = democratic\n";
-	newFocus->available += "				has_government = neutrality\n";
-	newFocus->available += "			}";
-	newFocus->xPos = 20;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 95\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0.1\n";
-	newFocus->aiWillDo += "				any_neighbor_country = {\n";
-	newFocus->aiWillDo += "					is_major = yes\n";
-	newFocus->aiWillDo += "					OR = {\n";
-	newFocus->aiWillDo += "						has_government = communism\n";
-	newFocus->aiWillDo += "						has_government = fascism\n";
-	newFocus->aiWillDo += "					}\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "				NOT = {\n";
-	newFocus->aiWillDo += "					any_neighbor_country = {\n";
-	newFocus->aiWillDo += "						is_major = yes\n";
-	newFocus->aiWillDo += "						has_government = democratic\n";
-	newFocus->aiWillDo += "					}\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_ideas = liberty_ethos_focus";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "militarism";
-	newFocus->icon = "GFX_goal_generic_political_pressure";
-	newFocus->prerequisites.push_back("focus = nationalism_focus");
-	newFocus->xPos = 16;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { has_idea = neutrality_idea }\n";
-	newFocus->completionReward += "				remove_ideas = neutrality_idea\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			add_ideas = militarism_focus\n";
-	newFocus->completionReward += "			army_experience = 20\n";
-	newFocus->completionReward += "			set_rule = { can_send_volunteers = yes }";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "political_correctness";
-	newFocus->icon = "GFX_goal_generic_dangerous_deal";
-	newFocus->prerequisites.push_back("focus = internationalism_focus");
-	newFocus->xPos = 18;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { has_idea = neutrality_idea }\n";
-	newFocus->completionReward += "				remove_ideas = neutrality_idea\n";
-	newFocus->completionReward += "			}		\n";
-	newFocus->completionReward += "			add_political_power = 200\n";
-	newFocus->completionReward += "			add_ideas = idea_political_correctness";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "neutrality_focus";
-	newFocus->icon = "GFX_goal_generic_neutrality_focus";
-	newFocus->prerequisites.push_back("focus = liberty_ethos");
-	newFocus->mutuallyExclusive = "focus = interventionism_focus";
-	newFocus->xPos = 20;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { NOT = { has_idea = neutrality_idea } }\n";
-	newFocus->completionReward += "				add_ideas = neutrality_idea\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			add_political_power = 150";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "interventionism_focus";
-	newFocus->icon = "GFX_goal_generic_political_pressure";
-	newFocus->prerequisites.push_back("focus = liberty_ethos");
-	newFocus->mutuallyExclusive = "focus = neutrality_focus";
-	newFocus->xPos = 22;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				has_idea = neutrality_idea\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { has_idea = neutrality_idea }\n";
-	newFocus->completionReward += "				remove_ideas = neutrality_idea\n";
-	newFocus->completionReward += "			}	\n";
-	newFocus->completionReward += "			set_rule = { can_send_volunteers = yes }\n";
-	newFocus->completionReward += "			add_political_power = 150";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "military_youth";
-	newFocus->icon = "GFX_goal_generic_more_territorial_claims";
-	newFocus->prerequisites.push_back("focus = militarism");
-	newFocus->xPos = 16;
-	newFocus->yPos = 4;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_ideas = military_youth_focus\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { has_government = fascism }\n";
-	newFocus->completionReward += "				add_popularity = {\n";
-	newFocus->completionReward += "					ideology = fascism\n";
-	newFocus->completionReward += "					popularity = 0.2\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { has_government = communism }\n";
-	newFocus->completionReward += "				add_popularity = {\n";
-	newFocus->completionReward += "					ideology = communism\n";
-	newFocus->completionReward += "					popularity = 0.2\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "deterrence";
-	newFocus->icon = "GFX_goal_generic_defence";
-	newFocus->prerequisites.push_back("focus = neutrality_focus");
-	newFocus->xPos = 20;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_ideas = deterrence";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "volunteer_corps";
-	newFocus->icon = "GFX_goal_generic_allies_build_infantry";
-	newFocus->prerequisites.push_back("focus = interventionism_focus");
-	newFocus->xPos = 22;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_ideas = volunteer_corps_focus";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "paramilitarism";
-	newFocus->icon = "GFX_goal_generic_military_sphere";
-	newFocus->prerequisites.push_back("focus = military_youth");
-	newFocus->xPos = 16;
-	newFocus->yPos = 5;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_ideas = paramilitarism_focus";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "indoctrination_focus";
-	newFocus->icon = "GFX_goal_generic_propaganda";
-	newFocus->prerequisites.push_back("focus = political_correctness");
-	newFocus->xPos = 18;
-	newFocus->yPos = 4;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_ideas = indoctrination_focus\n";
-	newFocus->completionReward += "			add_political_power = 150";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "foreign_expeditions";
-	newFocus->icon = "GFX_goal_generic_more_territorial_claims";
-	newFocus->prerequisites.push_back("focus = volunteer_corps");
-	newFocus->xPos = 22;
-	newFocus->yPos = 4;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_ideas = foreign_expeditions_focus";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "why_we_fight";
-	newFocus->icon = "GFX_goal_generic_propaganda";
-	newFocus->prerequisites.push_back("focus = foreign_expeditions focus = deterrence");
-	newFocus->available += "			OR = {\n";
-	newFocus->available += "				threat > 0.75\n";
-	newFocus->available += "				has_defensive_war = yes\n";
-	newFocus->available += "			}";
-	newFocus->continueIfInvalid += "yes";
-	newFocus->xPos = 20;
-	newFocus->yPos = 5;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { NOT = { has_idea = neutrality_idea } }\n";
-	newFocus->completionReward += "				set_rule = { can_create_factions = yes }\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			add_ideas = why_we_fight_focus";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "political_commissars";
-	newFocus->icon = "GFX_goal_generic_forceful_treaty";
-	newFocus->prerequisites.push_back("focus = indoctrination_focus");
-	newFocus->available = " ";
-	newFocus->xPos = 18;
-	newFocus->yPos = 5;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_ideas = political_commissars_focus\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { has_government = fascism }\n";
-	newFocus->completionReward += "				add_popularity = {\n";
-	newFocus->completionReward += "					ideology = fascism\n";
-	newFocus->completionReward += "					popularity = 0.2\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { has_government = communism }\n";
-	newFocus->completionReward += "				add_popularity = {\n";
-	newFocus->completionReward += "					ideology = communism\n";
-	newFocus->completionReward += "					popularity = 0.2\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			add_political_power = 200";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "ideological_fanaticism";
-	newFocus->icon = "GFX_goal_generic_demand_territory";
-	newFocus->prerequisites.push_back("focus = paramilitarism");
-	newFocus->prerequisites.push_back("focus = political_commissars");
-	newFocus->xPos = 17;
-	newFocus->yPos = 6;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			add_ideas = ideological_fanaticism_focus\n";
-	newFocus->completionReward += "			set_rule = {\n";
-	newFocus->completionReward += "				can_create_factions = yes\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			hidden_effect = {\n";
-	newFocus->completionReward += "				set_rule = { can_use_kamikaze_pilots = yes }\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			custom_effect_tooltip = kamikaze_focus_tooltip";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "technology_sharing";
-	newFocus->icon = "GFX_goal_generic_scientific_exchange";
-	newFocus->prerequisites.push_back("focus = ideological_fanaticism");
-	newFocus->prerequisites.push_back("focus = why_we_fight");
-	newFocus->available += "			has_war = yes\n";
-	newFocus->available += "			is_in_faction = yes\n";
-	newFocus->available += "			OR = {\n";
-	newFocus->available += "				num_of_factories > 50\n";
-	newFocus->available += "				any_country = {\n";
-	newFocus->available += "					is_in_faction_with = ROOT\n";
-	newFocus->available += "					num_of_factories > 50\n";
-	newFocus->available += "				}\n";
-	newFocus->available += "			}";
-	newFocus->xPos = 19;
-	newFocus->yPos = 7;
-	newFocus->cost = 10;
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					original_research_slots < 3\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_research_slot = 1\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					original_research_slots > 2\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_tech_bonus = {\n";
-	newFocus->completionReward += "					name = electronics_bonus\n";
-	newFocus->completionReward += "					bonus = 0.5\n";
-	newFocus->completionReward += "					uses = 1\n";
-	newFocus->completionReward += "					category = electronics\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_tech_bonus = {\n";
-	newFocus->completionReward += "					name = industrial_bonus\n";
-	newFocus->completionReward += "					bonus = 0.5\n";
-	newFocus->completionReward += "					uses = 1\n";
-	newFocus->completionReward += "					category = industry\n";
-	newFocus->completionReward += "				}	\n";
-	newFocus->completionReward += "				add_tech_bonus = {\n";
-	newFocus->completionReward += "					name = infantry_weapons_bonus\n";
-	newFocus->completionReward += "					bonus = 0.5\n";
-	newFocus->completionReward += "					uses = 1\n";
-	newFocus->completionReward += "					category = infantry_weapons\n";
-	newFocus->completionReward += "					category = artillery\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-}
-
-
-void HoI4FocusTree::addVersion1_3GenericFocusTree()
-{
-	HoI4Focus* newFocus = new HoI4Focus;
-	newFocus->id = "army_effort";
-	newFocus->icon = "GFX_goal_generic_allies_build_infantry";
-	newFocus->xPos = 1;
-	newFocus->yPos = 0;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward =  "			army_experience = 5\n";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = land_doc_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = land_doctrine\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "equipment_effort";
-	newFocus->icon = "GFX_goal_generic_small_arms";
-	newFocus->prerequisites.push_back("focus = army_effort");
-	newFocus->xPos = 0;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward =  "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = infantry_weapons_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = infantry_weapons\n";
-	newFocus->completionReward += "				category = artillery\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "motorization_effort";
-	newFocus->icon = "GFX_goal_generic_army_motorized";
-	newFocus->prerequisites.push_back("focus = army_effort");
-	newFocus->bypass = "			has_tech = motorised_infantry";
-	newFocus->xPos = 2;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward =  "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = motorized_bonus\n";
-	newFocus->completionReward += "				bonus = 0.75\n";
-	newFocus->completionReward += "				technology = motorised_infantry\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "doctrine_effort";
-	newFocus->icon = "GFX_goal_generic_army_doctrines";
-	newFocus->prerequisites.push_back("focus = army_effort");
-	newFocus->xPos = 1;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward  = "			army_experience = 5\n";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = land_doc_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = land_doctrine\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "equipment_effort_2";
-	newFocus->icon = "GFX_goal_generic_army_artillery";
-	newFocus->prerequisites.push_back("focus = equipment_effort");
-	newFocus->xPos = 0;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward  = "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = infantry_artillery_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = infantry_weapons\n";
-	newFocus->completionReward += "				category = artillery\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "mechanization_effort";
-	newFocus->icon = "GFX_goal_generic_build_tank";
-	newFocus->prerequisites.push_back("focus = motorization_effort");
-	newFocus->xPos = 2;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward  = "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = motorized_bonus\n";
-	newFocus->completionReward += "				ahead_reduction = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = motorized_equipment\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "doctrine_effort_2";
-	newFocus->icon = "GFX_goal_generic_army_doctrines";
-	newFocus->prerequisites.push_back("focus = doctrine_effort");
-	newFocus->xPos = 1;
-	newFocus->yPos = 4;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward  = "			army_experience = 5\n";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = land_doc_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = land_doctrine\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "equipment_effort_3";
-	newFocus->icon = "GFX_goal_generic_army_artillery2";
-	newFocus->prerequisites.push_back("focus = equipment_effort_2");
-	newFocus->xPos = 0;
-	newFocus->yPos = 5;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward  = "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = infantry_artillery_bonus\n";
-	newFocus->completionReward += "				ahead_reduction = 1\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = infantry_weapons\n";
-	newFocus->completionReward += "				category = artillery\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "armor_effort";
-	newFocus->icon = "GFX_goal_generic_army_tanks";
-	newFocus->prerequisites.push_back("focus = mechanization_effort");
-	newFocus->xPos = 2;
-	newFocus->yPos = 5;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward  = "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = armor_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 2\n";
-	newFocus->completionReward += "				category = armor\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "special_forces";
-	newFocus->icon = "GFX_goal_generic_special_forces";
-	newFocus->prerequisites.push_back("focus = equipment_effort_3");
-	newFocus->prerequisites.push_back("focus = doctrine_effort_2");
-	newFocus->prerequisites.push_back("focus = armor_effort");
-	newFocus->xPos = 1;
-	newFocus->yPos = 6;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward  = "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = special_forces_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				technology = paratroopers\n";
-	newFocus->completionReward += "				technology = paratroopers2\n";
-	newFocus->completionReward += "				technology = marines\n";
-	newFocus->completionReward += "				technology = marines2\n";
-	newFocus->completionReward += "				technology = tech_mountaineers\n";
-	newFocus->completionReward += "				technology = tech_mountaineers2\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "aviation_effort";
-	newFocus->icon = "GFX_goal_generic_build_airforce";
-	newFocus->xPos = 5;
-	newFocus->yPos = 0;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completeTooltip  = "			air_experience = 25\n";
-	newFocus->completeTooltip += "			if = { limit = { has_country_flag = aviation_effort_AB }\n";
-	newFocus->completeTooltip += "				add_building_construction = {\n";
-	newFocus->completeTooltip += "					type = air_base\n";
-	newFocus->completeTooltip += "					level = 2\n";
-	newFocus->completeTooltip += "					instant_build = yes\n";
-	newFocus->completeTooltip += "				}\n";
-	newFocus->completeTooltip += "			}			\n";
-	newFocus->completeTooltip += "			add_tech_bonus = {\n";
-	newFocus->completeTooltip += "				name = air_doc_bonus\n";
-	newFocus->completeTooltip += "				bonus = 0.5\n";
-	newFocus->completeTooltip += "				uses = 1\n";
-	newFocus->completeTooltip += "				category = air_doctrine\n";
-	newFocus->completeTooltip += "			}			";
-	newFocus->completionReward += "			air_experience = 25\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					capital_scope = {\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							free_building_slots = {\n";
-	newFocus->completionReward += "								building = air_base\n";
-	newFocus->completionReward += "								size > 1\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				random_owned_controlled_state = {\n";
-	newFocus->completionReward += "					limit = {\n";
-	newFocus->completionReward += "						free_building_slots = {\n";
-	newFocus->completionReward += "							building = air_base\n";
-	newFocus->completionReward += "							size > 1\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					add_building_construction = {\n";
-	newFocus->completionReward += "						type = air_base\n";
-	newFocus->completionReward += "						level = 2\n";
-	newFocus->completionReward += "						instant_build = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					ROOT = { set_country_flag = aviation_effort_AB }\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					capital_scope = {\n";
-	newFocus->completionReward += "						free_building_slots = {\n";
-	newFocus->completionReward += "							building = air_base\n";
-	newFocus->completionReward += "							size > 1\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				capital_scope = {\n";
-	newFocus->completionReward += "					add_building_construction = {\n";
-	newFocus->completionReward += "						type = air_base\n";
-	newFocus->completionReward += "						level = 2\n";
-	newFocus->completionReward += "						instant_build = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					ROOT = { set_country_flag = aviation_effort_AB }\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = air_doc_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = air_doctrine\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "fighter_focus";
-	newFocus->icon = "GFX_goal_generic_air_fighter";
-	newFocus->prerequisites.push_back("focus = aviation_effort");
-	newFocus->mutuallyExclusive = "focus = bomber_focus";
-	newFocus->xPos = 4;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = fighter_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 2\n";
-	newFocus->completionReward += "				technology = early_fighter\n";
-	newFocus->completionReward += "				technology = fighter1\n";
-	newFocus->completionReward += "				technology = fighter2\n";
-	newFocus->completionReward += "				technology = fighter3\n";
-	newFocus->completionReward += "				technology = heavy_fighter1\n";
-	newFocus->completionReward += "				technology = heavy_fighter2\n";
-	newFocus->completionReward += "				technology = heavy_fighter3\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "bomber_focus";
-	newFocus->icon = "GFX_goal_generic_air_bomber";
-	newFocus->prerequisites.push_back("focus = aviation_effort");
-	newFocus->mutuallyExclusive = "focus = fighter_focus";
-	newFocus->xPos = 6;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = bomber_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 2\n";
-	newFocus->completionReward += "				technology = strategic_bomber1\n";
-	newFocus->completionReward += "				technology = strategic_bomber2\n";
-	newFocus->completionReward += "				technology = strategic_bomber3\n";
-	newFocus->completionReward += "				category = tactical_bomber\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "aviation_effort_2";
-	newFocus->icon = "GFX_goal_generic_air_doctrine";
-	newFocus->prerequisites.push_back("focus = bomber_focus focus = fighter_focus");
-	newFocus->xPos = 5;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completeTooltip += "			air_experience = 25\n";
-	newFocus->completeTooltip += "			if = { limit = { has_country_flag = aviation_effort_2_AB }\n";
-	newFocus->completeTooltip += "				add_building_construction = {\n";
-	newFocus->completeTooltip += "					type = air_base\n";
-	newFocus->completeTooltip += "					level = 2\n";
-	newFocus->completeTooltip += "					instant_build = yes\n";
-	newFocus->completeTooltip += "				}\n";
-	newFocus->completeTooltip += "			}\n";
-	newFocus->completeTooltip += "			add_tech_bonus = {\n";
-	newFocus->completeTooltip += "				name =  air_doc_bonus\n";
-	newFocus->completeTooltip += "				bonus = 0.5\n";
-	newFocus->completeTooltip += "				uses = 1\n";
-	newFocus->completeTooltip += "				category = air_doctrine\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			air_experience = 25\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					capital_scope = {\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "							NOT = { is_controlled_by = ROOT }\n";
-	newFocus->completionReward += "							NOT = {\n";
-	newFocus->completionReward += "								free_building_slots = {\n";
-	newFocus->completionReward += "									building = air_base\n";
-	newFocus->completionReward += "									size > 1\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				random_owned_controlled_state = {\n";
-	newFocus->completionReward += "					limit = {\n";
-	newFocus->completionReward += "						free_building_slots = {\n";
-	newFocus->completionReward += "							building = air_base\n";
-	newFocus->completionReward += "							size > 1\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					add_building_construction = {\n";
-	newFocus->completionReward += "						type = air_base\n";
-	newFocus->completionReward += "						level = 2\n";
-	newFocus->completionReward += "						instant_build = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					ROOT = { set_country_flag = aviation_effort_2_AB }\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					capital_scope = {\n";
-	newFocus->completionReward += "						is_controlled_by = ROOT\n";
-	newFocus->completionReward += "						free_building_slots = {\n";
-	newFocus->completionReward += "							building = air_base\n";
-	newFocus->completionReward += "							size > 1\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				capital_scope = {\n";
-	newFocus->completionReward += "					add_building_construction = {\n";
-	newFocus->completionReward += "						type = air_base\n";
-	newFocus->completionReward += "						level = 2\n";
-	newFocus->completionReward += "						instant_build = yes\n";
-	newFocus->completionReward += "					}				\n";
-	newFocus->completionReward += "					ROOT = { set_country_flag = aviation_effort_2_AB }\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name =  air_doc_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = air_doctrine\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "CAS_effort";
-	newFocus->icon = "GFX_goal_generic_CAS";
-	newFocus->prerequisites.push_back("focus = aviation_effort_2");
-	newFocus->prerequisites.push_back("focus = motorization_effort");
-	newFocus->xPos = 4;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = CAS_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				ahead_reduction = 1\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = cas_bomber\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "rocket_effort";
-	newFocus->icon = "GFX_focus_rocketry";
-	newFocus->prerequisites.push_back("focus = aviation_effort_2");
-	newFocus->prerequisites.push_back("focus = infrastructure_effort");
-	newFocus->xPos = 5;
-	newFocus->yPos = 4;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = jet_rocket_bonus\n";
-	newFocus->completionReward += "				ahead_reduction = 0.5\n";
-	newFocus->completionReward += "				uses = 2\n";
-	newFocus->completionReward += "				category = rocketry\n";
-	newFocus->completionReward += "				category = jet_technology\n";
-	newFocus->completionReward += "			}";
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0.25\n";
-	newFocus->aiWillDo += "				always = yes\n";
-	newFocus->aiWillDo += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "NAV_effort";
-	newFocus->icon = "GFX_goal_generic_air_naval_bomber";
-	newFocus->prerequisites.push_back("focus = aviation_effort_2");
-	newFocus->prerequisites.push_back("focus = flexible_navy");
-	newFocus->xPos = 6;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = nav_bomber_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				ahead_reduction = 1\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = naval_bomber\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "naval_effort";
-	newFocus->icon = "GFX_goal_generic_construct_naval_dockyard";
-	newFocus->xPos = 9;
-	newFocus->yPos = 0;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->available += "			any_state = {\n";
-	newFocus->available += "				is_coastal = yes\n";
-	newFocus->available += "				is_controlled_by = ROOT\n";
-	newFocus->available += "			}";
-	newFocus->completeTooltip += "			navy_experience = 25\n";
-	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 3\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = dockyard\n";
-	newFocus->completeTooltip += "				level = 3\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			navy_experience = 25\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					NOT = {\n";
-	newFocus->completionReward += "						any_owned_state = {\n";
-	newFocus->completionReward += "							dockyard > 0\n";
-	newFocus->completionReward += "							free_building_slots = {\n";
-	newFocus->completionReward += "								building = dockyard\n";
-	newFocus->completionReward += "								size > 2\n";
-	newFocus->completionReward += "								include_locked = yes\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					any_owned_state = {\n";
-	newFocus->completionReward += "						is_coastal = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				random_owned_controlled_state = {\n";
-	newFocus->completionReward += "					limit = {\n";
-	newFocus->completionReward += "						is_coastal = yes\n";
-	newFocus->completionReward += "						free_building_slots = {\n";
-	newFocus->completionReward += "							building = dockyard\n";
-	newFocus->completionReward += "							size > 2\n";
-	newFocus->completionReward += "							include_locked = yes\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					add_extra_state_shared_building_slots = 3\n";
-	newFocus->completionReward += "					add_building_construction = {\n";
-	newFocus->completionReward += "						type = dockyard\n";
-	newFocus->completionReward += "						level = 3\n";
-	newFocus->completionReward += "						instant_build = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				set_country_flag = naval_effort_built\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					NOT = { has_country_flag = naval_effort_built }\n";
-	newFocus->completionReward += "					any_owned_state = {\n";
-	newFocus->completionReward += "						dockyard > 0\n";
-	newFocus->completionReward += "						free_building_slots = {\n";
-	newFocus->completionReward += "							building = dockyard\n";
-	newFocus->completionReward += "							size > 2\n";
-	newFocus->completionReward += "							include_locked = yes\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				random_owned_controlled_state = {\n";
-	newFocus->completionReward += "					limit = {\n";
-	newFocus->completionReward += "						dockyard > 0\n";
-	newFocus->completionReward += "						free_building_slots = {\n";
-	newFocus->completionReward += "							building = dockyard\n";
-	newFocus->completionReward += "							size > 2\n";
-	newFocus->completionReward += "							include_locked = yes\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					add_extra_state_shared_building_slots = 3\n";
-	newFocus->completionReward += "					add_building_construction = {\n";
-	newFocus->completionReward += "						type = dockyard\n";
-	newFocus->completionReward += "						level = 3\n";
-	newFocus->completionReward += "						instant_build = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				set_country_flag = naval_effort_built\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					NOT = { has_country_flag = naval_effort_built }\n";
-	newFocus->completionReward += "					NOT = {\n";
-	newFocus->completionReward += "						any_owned_state = {\n";
-	newFocus->completionReward += "							free_building_slots = {\n";
-	newFocus->completionReward += "								building = dockyard\n";
-	newFocus->completionReward += "								size > 2\n";
-	newFocus->completionReward += "								include_locked = yes\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				random_state = {\n";
-	newFocus->completionReward += "					limit = {\n";
-	newFocus->completionReward += "						controller = { tag = ROOT }\n";
-	newFocus->completionReward += "						free_building_slots = {\n";
-	newFocus->completionReward += "							building = dockyard\n";
-	newFocus->completionReward += "							size > 2\n";
-	newFocus->completionReward += "							include_locked = yes\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					add_extra_state_shared_building_slots = 3\n";
-	newFocus->completionReward += "					add_building_construction = {\n";
-	newFocus->completionReward += "						type = dockyard\n";
-	newFocus->completionReward += "						level = 3\n";
-	newFocus->completionReward += "						instant_build = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "flexible_navy";
-	newFocus->icon = "GFX_goal_generic_build_navy";
-	newFocus->prerequisites.push_back("focus = naval_effort");
-	newFocus->mutuallyExclusive = "focus = large_navy";
-	newFocus->xPos = 8;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				all_owned_state = {\n";
-	newFocus->aiWillDo += "					OR = {\n";
-	newFocus->aiWillDo += "						is_coastal = no\n";
-	newFocus->aiWillDo += "						dockyard < 1\n";
-	newFocus->aiWillDo += "					}\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = sub_op_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 2\n";
-	newFocus->completionReward += "				technology = convoy_interdiction_ti\n";
-	newFocus->completionReward += "				technology = unrestricted_submarine_warfare\n";
-	newFocus->completionReward += "				technology = wolfpacks\n";
-	newFocus->completionReward += "				technology = advanced_submarine_warfare\n";
-	newFocus->completionReward += "				technology = combined_operations_raiding\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "large_navy";
-	newFocus->icon = "GFX_goal_generic_navy_doctrines_tactics";
-	newFocus->prerequisites.push_back("focus = naval_effort");
-	newFocus->mutuallyExclusive = "focus = flexible_navy";
-	newFocus->xPos = 10;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				all_owned_state = {\n";
-	newFocus->aiWillDo += "					OR = {\n";
-	newFocus->aiWillDo += "						is_coastal = no\n";
-	newFocus->aiWillDo += "						dockyard < 1\n";
-	newFocus->aiWillDo += "					}\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = fleet_in_being_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 2\n";
-	newFocus->completionReward += "				category = fleet_in_being_tree\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "submarine_effort";
-	newFocus->icon = "GFX_goal_generic_navy_submarine";
-	newFocus->prerequisites.push_back("focus = flexible_navy focus = large_navy");
-	newFocus->xPos = 8;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				all_owned_state = {\n";
-	newFocus->aiWillDo += "					OR = {\n";
-	newFocus->aiWillDo += "						is_coastal = no\n";
-	newFocus->aiWillDo += "						dockyard < 1\n";
-	newFocus->aiWillDo += "					}\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = ss_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				ahead_reduction = 1\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				technology = early_submarine\n";
-	newFocus->completionReward += "				technology = basic_submarine\n";
-	newFocus->completionReward += "				technology = improved_submarine\n";
-	newFocus->completionReward += "				technology = advanced_submarine\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "cruiser_effort";
-	newFocus->icon = "GFX_goal_generic_navy_cruiser";
-	newFocus->prerequisites.push_back("focus = large_navy focus = flexible_navy");
-	newFocus->xPos = 10;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				all_owned_state = {\n";
-	newFocus->aiWillDo += "					OR = {\n";
-	newFocus->aiWillDo += "						is_coastal = no\n";
-	newFocus->aiWillDo += "						dockyard < 1\n";
-	newFocus->aiWillDo += "					}\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = cr_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				ahead_reduction = 1\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				technology = improved_light_cruiser\n";
-	newFocus->completionReward += "				technology = advanced_light_cruiser\n";
-	newFocus->completionReward += "				technology = improved_heavy_cruiser\n";
-	newFocus->completionReward += "				technology = advanced_heavy_cruiser\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "destroyer_effort";
-	newFocus->icon = "GFX_goal_generic_wolf_pack";
-	newFocus->prerequisites.push_back("focus = submarine_effort");
-	newFocus->xPos = 8;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				all_owned_state = {\n";
-	newFocus->aiWillDo += "					OR = {\n";
-	newFocus->aiWillDo += "						is_coastal = no\n";
-	newFocus->aiWillDo += "						dockyard < 1\n";
-	newFocus->aiWillDo += "					}\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = dd_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				ahead_reduction = 1\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				technology = early_destroyer\n";
-	newFocus->completionReward += "				technology = basic_destroyer\n";
-	newFocus->completionReward += "				technology = improved_destroyer\n";
-	newFocus->completionReward += "				technology = advanced_destroyer\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "capital_ships_effort";
-	newFocus->icon = "GFX_goal_generic_navy_battleship";
-	newFocus->prerequisites.push_back("focus = cruiser_effort");
-	newFocus->xPos = 10;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				all_owned_state = {\n";
-	newFocus->aiWillDo += "					OR = {\n";
-	newFocus->aiWillDo += "						is_coastal = no\n";
-	newFocus->aiWillDo += "						dockyard < 1\n";
-	newFocus->aiWillDo += "					}\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			navy_experience = 25\n";
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = capital_ships_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				ahead_reduction = 1\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				technology = basic_battlecruiser\n";
-	newFocus->completionReward += "				technology = basic_battleship\n";
-	newFocus->completionReward += "				technology = improved_battleship\n";
-	newFocus->completionReward += "				technology = advanced_battleship\n";
-	newFocus->completionReward += "				technology = heavy_battleship\n";
-	newFocus->completionReward += "				technology = heavy_battleship2\n";
-	newFocus->completionReward += "				technology = early_carrier\n";
-	newFocus->completionReward += "				technology = basic_carrier\n";
-	newFocus->completionReward += "				technology = improved_carrier\n";
-	newFocus->completionReward += "				technology = advanced_carrier\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "industrial_effort";
-	newFocus->icon = "GFX_goal_generic_production";
-	newFocus->xPos = 13;
-	newFocus->yPos = 0;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = industrial_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 1\n";
-	newFocus->completionReward += "				category = industry\n";
-	newFocus->completionReward += "			}";
-	newFocus->aiWillDo += "			factor = 3\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				date < 1939.1.1\n";
-	newFocus->aiWillDo += "				OR = {\n";
-	newFocus->aiWillDo += "					# we also dont want tiny nations to go crazy with slots right away\n";
-	newFocus->aiWillDo += "					num_of_controlled_states < 2\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "construction_effort";
-	newFocus->icon = "GFX_goal_generic_construct_civ_factory";
-	newFocus->prerequisites.push_back("focus = industrial_effort");
-	newFocus->xPos = 12;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 2";
-	newFocus->bypass += "			custom_trigger_tooltip = {\n";
-	newFocus->bypass += "				tooltip = construction_effort_tt\n";
-	newFocus->bypass += "				all_owned_state = {\n";
-	newFocus->bypass += "					free_building_slots = {\n";
-	newFocus->bypass += "						building = industrial_complex\n";
-	newFocus->bypass += "						size < 1\n";
-	newFocus->bypass += "						include_locked = yes\n";
-	newFocus->bypass += "					}					\n";
-	newFocus->bypass += "				}\n";
-	newFocus->bypass += "			}";
-	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = industrial_complex\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			random_owned_controlled_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = industrial_complex\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = industrial_complex\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = industrial_complex\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "production_effort";
-	newFocus->icon = "GFX_goal_generic_construct_mil_factory";
-	newFocus->prerequisites.push_back("focus = industrial_effort");
-	newFocus->xPos = 14;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 2";
-	newFocus->bypass += "			custom_trigger_tooltip = {\n";
-	newFocus->bypass += "				tooltip = production_effort_tt\n";
-	newFocus->bypass += "				all_owned_state = {\n";
-	newFocus->bypass += "					free_building_slots = {\n";
-	newFocus->bypass += "						building = arms_factory\n";
-	newFocus->bypass += "						size < 1\n";
-	newFocus->bypass += "						include_locked = yes\n";
-	newFocus->bypass += "					}\n";
-	newFocus->bypass += "				}\n";
-	newFocus->bypass += "			}";
-	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = arms_factory\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			random_owned_controlled_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = arms_factory\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = arms_factory\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = arms_factory\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "construction_effort_2";
-	newFocus->icon = "GFX_goal_generic_construct_civ_factory";
-	newFocus->prerequisites.push_back("focus = construction_effort");
-	newFocus->xPos = 12;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 2";
-	newFocus->bypass += "			custom_trigger_tooltip = {\n";
-	newFocus->bypass += "				tooltip = construction_effort_tt\n";
-	newFocus->bypass += "				all_owned_state = {\n";
-	newFocus->bypass += "					free_building_slots = {\n";
-	newFocus->bypass += "						building = industrial_complex\n";
-	newFocus->bypass += "						size < 1\n";
-	newFocus->bypass += "						include_locked = yes\n";
-	newFocus->bypass += "					}\n";
-	newFocus->bypass += "				}\n";
-	newFocus->bypass += "			}";
-	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = industrial_complex\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			random_owned_controlled_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = industrial_complex\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = industrial_complex\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = industrial_complex\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "production_effort_2";
-	newFocus->icon = "GFX_goal_generic_construct_mil_factory";
-	newFocus->prerequisites.push_back("focus = production_effort");
-	newFocus->xPos = 14;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 2";
-	newFocus->bypass += "			custom_trigger_tooltip = {\n";
-	newFocus->bypass += "				tooltip = production_effort_tt\n";
-	newFocus->bypass += "				all_owned_state = {\n";
-	newFocus->bypass += "					free_building_slots = {\n";
-	newFocus->bypass += "						building = arms_factory\n";
-	newFocus->bypass += "						size < 1\n";
-	newFocus->bypass += "						include_locked = yes\n";
-	newFocus->bypass += "					}\n";
-	newFocus->bypass += "				}\n";
-	newFocus->bypass += "			}";
-	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = arms_factory\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			random_owned_controlled_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = arms_factory\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = arms_factory\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = arms_factory\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "infrastructure_effort";
-	newFocus->icon = "GFX_goal_generic_construct_infrastructure";
-	newFocus->prerequisites.push_back("focus = construction_effort_2");
-	newFocus->xPos = 12;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->bypass += "			custom_trigger_tooltip = {\n";
-	newFocus->bypass += "				tooltip = infrastructure_effort_tt\n";
-	newFocus->bypass += "				all_owned_state = {			\n";
-	newFocus->bypass += "					free_building_slots = {\n";
-	newFocus->bypass += "						building = infrastructure\n";
-	newFocus->bypass += "						size < 1\n";
-	newFocus->bypass += "					}\n";
-	newFocus->bypass += "				}\n";
-	newFocus->bypass += "			}";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = infrastructure\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = infrastructure\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			random_owned_controlled_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = infrastructure\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = infrastructure\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = infrastructure\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			random_owned_controlled_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = infrastructure\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = infrastructure\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = infrastructure\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "production_effort_3";
-	newFocus->icon = "GFX_goal_generic_construct_mil_factory";
-	newFocus->prerequisites.push_back("focus = production_effort_2");
-	newFocus->xPos = 14;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 2";
-	newFocus->bypass += "			custom_trigger_tooltip = {\n";
-	newFocus->bypass += "				tooltip = production_effort_tt\n";
-	newFocus->bypass += "				all_owned_state = {\n";
-	newFocus->bypass += "					free_building_slots = {\n";
-	newFocus->bypass += "						building = arms_factory\n";
-	newFocus->bypass += "						size < 1\n";
-	newFocus->bypass += "						include_locked = yes\n";
-	newFocus->bypass += "					}\n";
-	newFocus->bypass += "				}\n";
-	newFocus->bypass += "			}";
-	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = arms_factory\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			random_owned_controlled_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = arms_factory\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = arms_factory\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = arms_factory\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "infrastructure_effort_2";
-	newFocus->icon = "GFX_goal_generic_construct_infrastructure";
-	newFocus->prerequisites.push_back("focus = infrastructure_effort");
-	newFocus->xPos = 12;
-	newFocus->yPos = 4;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->bypass += "			custom_trigger_tooltip = {\n";
-	newFocus->bypass += "				tooltip = infrastructure_effort_tt\n";
-	newFocus->bypass += "				all_owned_state = {			\n";
-	newFocus->bypass += "					free_building_slots = {\n";
-	newFocus->bypass += "						building = infrastructure\n";
-	newFocus->bypass += "						size < 1\n";
-	newFocus->bypass += "					}\n";
-	newFocus->bypass += "				}\n";
-	newFocus->bypass += "			}";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = infrastructure\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = infrastructure\n";
-	newFocus->completeTooltip += "				level = 1\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			random_owned_controlled_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = infrastructure\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = infrastructure\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = infrastructure\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			random_owned_controlled_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = infrastructure\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = infrastructure\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = infrastructure\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "construction_effort_3";
-	newFocus->icon = "GFX_goal_generic_construct_civ_factory";
-	newFocus->prerequisites.push_back("focus = infrastructure_effort");
-	newFocus->xPos = 14;
-	newFocus->yPos = 4;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 2";
-	newFocus->bypass += "			custom_trigger_tooltip = {\n";
-	newFocus->bypass += "				tooltip = construction_effort_tt\n";
-	newFocus->bypass += "				all_owned_state = {\n";
-	newFocus->bypass += "					free_building_slots = {\n";
-	newFocus->bypass += "						building = industrial_complex\n";
-	newFocus->bypass += "						size < 2\n";
-	newFocus->bypass += "						include_locked = yes\n";
-	newFocus->bypass += "					}\n";
-	newFocus->bypass += "				}\n";
-	newFocus->bypass += "			}";
-	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 2\n";
-	newFocus->completeTooltip += "			add_building_construction = {\n";
-	newFocus->completeTooltip += "				type = industrial_complex\n";
-	newFocus->completeTooltip += "				level = 2\n";
-	newFocus->completeTooltip += "				instant_build = yes\n";
-	newFocus->completeTooltip += "			}";
-	newFocus->completionReward += "			random_owned_controlled_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = industrial_complex\n";
-	newFocus->completionReward += "						size > 1\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = industrial_complex\n";
-	newFocus->completionReward += "										size > 1\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 2\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = industrial_complex\n";
-	newFocus->completionReward += "					level = 2\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "nuclear_effort";
-	newFocus->icon = "GFX_focus_wonderweapons";
-	newFocus->prerequisites.push_back("focus = infrastructure_effort_2");
-	newFocus->xPos = 10;
-	newFocus->yPos = 5;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = nuclear_bonus\n";
-	newFocus->completionReward += "				ahead_reduction = 0.5\n";
-	newFocus->completionReward += "				category = nuclear\n";
-	newFocus->completionReward += "			}";
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0.25\n";
-	newFocus->aiWillDo += "				always = yes\n";
-	newFocus->aiWillDo += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "extra_tech_slot";
-	newFocus->icon = "GFX_focus_research";
-	newFocus->prerequisites.push_back("focus = infrastructure_effort_2");
-	newFocus->xPos = 12;
-	newFocus->yPos = 5;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_research_slot = 1";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "extra_tech_slot_2";
-	newFocus->icon = "GFX_focus_research";
-	newFocus->prerequisites.push_back("focus = extra_tech_slot");
-	newFocus->available += "			num_of_factories > 50";
-	newFocus->cancelIfInvalid += "no";
-	newFocus->continueIfInvalid += "yes";
-	newFocus->xPos = 12;
-	newFocus->yPos = 6;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_research_slot = 1";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "secret_weapons";
-	newFocus->icon = "GFX_goal_generic_secret_weapon";
-	newFocus->prerequisites.push_back("focus = infrastructure_effort_2");
-	newFocus->xPos = 14;
-	newFocus->yPos = 5;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_tech_bonus = {\n";
-	newFocus->completionReward += "				name = secret_bonus\n";
-	newFocus->completionReward += "				bonus = 0.5\n";
-	newFocus->completionReward += "				uses = 4\n";
-	newFocus->completionReward += "				category = electronics\n";
-	newFocus->completionReward += "				category = nuclear\n";
-	newFocus->completionReward += "				category = rocketry\n";
-	newFocus->completionReward += "			}";
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0.25\n";
-	newFocus->aiWillDo += "				always = yes\n";
-	newFocus->aiWillDo += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "political_effort";
-	newFocus->icon = "GFX_goal_generic_demand_territory";
-	newFocus->xPos = 19;
-	newFocus->yPos = 0;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_political_power = 120";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "collectivist_ethos";
-	newFocus->icon = "GFX_goal_generic_national_unity #icon = GFX_goal_tripartite_pact";
-	newFocus->prerequisites.push_back("focus = political_effort");
-	newFocus->mutuallyExclusive = "focus = liberty_ethos";
-	newFocus->available += "			OR = {\n";
-	newFocus->available += "				has_government = fascism\n";
-	newFocus->available += "				has_government = communism\n";
-	newFocus->available += "				has_government = neutrality\n";
-	newFocus->available += "			}";
-	newFocus->xPos = 18;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 5\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				OR = {\n";
-	newFocus->aiWillDo += "					is_historical_focus_on = yes\n";
-	newFocus->aiWillDo += "					has_idea = neutrality_idea\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_ideas = collectivist_ethos_focus";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "nationalism_focus";
-	newFocus->icon = "GFX_goal_support_fascism #icon = GFX_goal_tripartite_pact";
-	newFocus->prerequisites.push_back("focus = collectivist_ethos");
-	newFocus->mutuallyExclusive = "focus = internationalism_focus";
-	newFocus->available += "			OR = {\n";
-	newFocus->available += "				has_government = fascism\n";
-	newFocus->available += "				has_government = neutrality\n";
-	newFocus->available += "			}";
-	newFocus->xPos = 16;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 5\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 2\n";
-	newFocus->aiWillDo += "				any_neighbor_country = {\n";
-	newFocus->aiWillDo += "					is_major = yes\n";
-	newFocus->aiWillDo += "					has_government = fascism\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_ideas = nationalism";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "internationalism_focus";
-	newFocus->icon = "GFX_goal_support_communism #icon = GFX_goal_tripartite_pact";
-	newFocus->prerequisites.push_back("focus = collectivist_ethos");
-	newFocus->mutuallyExclusive = "focus = nationalism_focus";
-	newFocus->available += "			OR = {\n";
-	newFocus->available += "				has_government = communism\n";
-	newFocus->available += "				has_government = neutrality\n";
-	newFocus->available += "			}";
-	newFocus->xPos = 18;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 5\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 2\n";
-	newFocus->aiWillDo += "				any_neighbor_country = {\n";
-	newFocus->aiWillDo += "					is_major = yes\n";
-	newFocus->aiWillDo += "					has_government = communism\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_ideas = internationalism";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "liberty_ethos";
-	newFocus->icon = "GFX_goal_support_democracy";
-	newFocus->prerequisites.push_back("focus = political_effort");
-	newFocus->mutuallyExclusive = "focus = collectivist_ethos";
-	newFocus->available += "			OR = {\n";
-	newFocus->available += "				has_government = democratic\n";
-	newFocus->available += "				has_government = neutrality\n";
-	newFocus->available += "			}";
-	newFocus->xPos = 20;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 95\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0.1\n";
-	newFocus->aiWillDo += "				any_neighbor_country = {\n";
-	newFocus->aiWillDo += "					is_major = yes\n";
-	newFocus->aiWillDo += "					OR = {\n";
-	newFocus->aiWillDo += "						has_government = communism\n";
-	newFocus->aiWillDo += "						has_government = fascism\n";
-	newFocus->aiWillDo += "					}\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "				NOT = {\n";
-	newFocus->aiWillDo += "					any_neighbor_country = {\n";
-	newFocus->aiWillDo += "						is_major = yes\n";
-	newFocus->aiWillDo += "						has_government = democratic\n";
-	newFocus->aiWillDo += "					}\n";
-	newFocus->aiWillDo += "				}\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_ideas = liberty_ethos_focus";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "militarism";
-	newFocus->icon = "GFX_goal_generic_political_pressure";
-	newFocus->prerequisites.push_back("focus = nationalism_focus");
-	newFocus->xPos = 16;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { has_idea = neutrality_idea }\n";
-	newFocus->completionReward += "				remove_ideas = neutrality_idea\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			add_ideas = militarism_focus\n";
-	newFocus->completionReward += "			army_experience = 20\n";
-	newFocus->completionReward += "			set_rule = { can_send_volunteers = yes }";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "political_correctness";
-	newFocus->icon = "GFX_goal_generic_dangerous_deal";
-	newFocus->prerequisites.push_back("focus = internationalism_focus");
-	newFocus->xPos = 18;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { has_idea = neutrality_idea }\n";
-	newFocus->completionReward += "				remove_ideas = neutrality_idea\n";
-	newFocus->completionReward += "			}		\n";
-	newFocus->completionReward += "			add_political_power = 200\n";
-	newFocus->completionReward += "			add_ideas = idea_political_correctness";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "neutrality_focus";
-	newFocus->icon = "GFX_goal_generic_neutrality_focus";
-	newFocus->prerequisites.push_back("focus = liberty_ethos");
-	newFocus->mutuallyExclusive = "focus = interventionism_focus";
-	newFocus->xPos = 20;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { NOT = { has_idea = neutrality_idea } }\n";
-	newFocus->completionReward += "				add_ideas = neutrality_idea\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			add_political_power = 150";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "interventionism_focus";
-	newFocus->icon = "GFX_goal_generic_political_pressure";
-	newFocus->prerequisites.push_back("focus = liberty_ethos");
-	newFocus->mutuallyExclusive = "focus = neutrality_focus";
-	newFocus->xPos = 22;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->aiWillDo += "			factor = 1\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				has_idea = neutrality_idea\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { has_idea = neutrality_idea }\n";
-	newFocus->completionReward += "				remove_ideas = neutrality_idea\n";
-	newFocus->completionReward += "			}	\n";
-	newFocus->completionReward += "			set_rule = { can_send_volunteers = yes }\n";
-	newFocus->completionReward += "			add_political_power = 150";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "military_youth";
-	newFocus->icon = "GFX_goal_generic_more_territorial_claims";
-	newFocus->prerequisites.push_back("focus = militarism");
-	newFocus->xPos = 16;
-	newFocus->yPos = 4;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_ideas = military_youth_focus\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { has_government = fascism }\n";
-	newFocus->completionReward += "				add_popularity = {\n";
-	newFocus->completionReward += "					ideology = fascism\n";
-	newFocus->completionReward += "					popularity = 0.2\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { has_government = communism }\n";
-	newFocus->completionReward += "				add_popularity = {\n";
-	newFocus->completionReward += "					ideology = communism\n";
-	newFocus->completionReward += "					popularity = 0.2\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "deterrence";
-	newFocus->icon = "GFX_goal_generic_defence";
-	newFocus->prerequisites.push_back("focus = neutrality_focus");
-	newFocus->xPos = 20;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_ideas = deterrence";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "volunteer_corps";
-	newFocus->icon = "GFX_goal_generic_allies_build_infantry";
-	newFocus->prerequisites.push_back("focus = interventionism_focus");
-	newFocus->xPos = 22;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_ideas = volunteer_corps_focus";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "paramilitarism";
-	newFocus->icon = "GFX_goal_generic_military_sphere";
-	newFocus->prerequisites.push_back("focus = military_youth");
-	newFocus->xPos = 16;
-	newFocus->yPos = 5;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_ideas = paramilitarism_focus";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "indoctrination_focus";
-	newFocus->icon = "GFX_goal_generic_propaganda";
-	newFocus->prerequisites.push_back("focus = political_correctness");
-	newFocus->xPos = 18;
-	newFocus->yPos = 4;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_ideas = indoctrination_focus\n";
-	newFocus->completionReward += "			add_political_power = 150";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "foreign_expeditions";
-	newFocus->icon = "GFX_goal_generic_more_territorial_claims";
-	newFocus->prerequisites.push_back("focus = volunteer_corps");
-	newFocus->xPos = 22;
-	newFocus->yPos = 4;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_ideas = foreign_expeditions_focus";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "why_we_fight";
-	newFocus->icon = "GFX_goal_generic_propaganda";
-	newFocus->prerequisites.push_back("focus = foreign_expeditions focus = deterrence");
-	newFocus->available += "			OR = {\n";
-	newFocus->available += "				threat > 0.75\n";
-	newFocus->available += "				has_defensive_war = yes\n";
-	newFocus->available += "			}";
-	newFocus->continueIfInvalid += "yes";
-	newFocus->xPos = 20;
-	newFocus->yPos = 5;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { NOT = { has_idea = neutrality_idea } }\n";
-	newFocus->completionReward += "				set_rule = { can_create_factions = yes }\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			add_ideas = why_we_fight_focus";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "political_commissars";
-	newFocus->icon = "GFX_goal_generic_forceful_treaty";
-	newFocus->prerequisites.push_back("focus = indoctrination_focus");
-	newFocus->available = " ";
-	newFocus->xPos = 18;
-	newFocus->yPos = 5;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_ideas = political_commissars_focus\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { has_government = fascism }\n";
-	newFocus->completionReward += "				add_popularity = {\n";
-	newFocus->completionReward += "					ideology = fascism\n";
-	newFocus->completionReward += "					popularity = 0.2\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = { has_government = communism }\n";
-	newFocus->completionReward += "				add_popularity = {\n";
-	newFocus->completionReward += "					ideology = communism\n";
-	newFocus->completionReward += "					popularity = 0.2\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			add_political_power = 200";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "ideological_fanaticism";
-	newFocus->icon = "GFX_goal_generic_demand_territory";
-	newFocus->prerequisites.push_back("focus = paramilitarism");
-	newFocus->prerequisites.push_back("focus = political_commissars");
-	newFocus->xPos = 17;
-	newFocus->yPos = 6;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			add_ideas = ideological_fanaticism_focus\n";
-	newFocus->completionReward += "			set_rule = {\n";
-	newFocus->completionReward += "				can_create_factions = yes\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			hidden_effect = {\n";
-	newFocus->completionReward += "				set_rule = { can_use_kamikaze_pilots = yes }\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			custom_effect_tooltip = kamikaze_focus_tooltip";
-	focuses.push_back(newFocus);
-
-	newFocus = new HoI4Focus;
-	newFocus->id = "technology_sharing";
-	newFocus->icon = "GFX_goal_generic_scientific_exchange";
-	newFocus->prerequisites.push_back("focus = ideological_fanaticism");
-	newFocus->prerequisites.push_back("focus = why_we_fight");
-	newFocus->available += "			has_war = yes\n";
-	newFocus->available += "			is_in_faction = yes\n";
-	newFocus->available += "			OR = {\n";
-	newFocus->available += "				num_of_factories > 50\n";
-	newFocus->available += "				any_other_country = {\n";
-	newFocus->available += "					is_in_faction_with = ROOT\n";
-	newFocus->available += "					num_of_factories > 50\n";
-	newFocus->available += "				}\n";
-	newFocus->available += "			}";
-	newFocus->xPos = 19;
-	newFocus->yPos = 7;
-	newFocus->cost = 10;
-	newFocus->availableIfCapitulated = true;
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					original_research_slots < 3\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_research_slot = 1\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			if = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					original_research_slots > 2\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_tech_bonus = {\n";
-	newFocus->completionReward += "					name = electronics_bonus\n";
-	newFocus->completionReward += "					bonus = 0.5\n";
-	newFocus->completionReward += "					uses = 1\n";
-	newFocus->completionReward += "					category = electronics\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_tech_bonus = {\n";
-	newFocus->completionReward += "					name = industrial_bonus\n";
-	newFocus->completionReward += "					bonus = 0.5\n";
-	newFocus->completionReward += "					uses = 1\n";
-	newFocus->completionReward += "					category = industry\n";
-	newFocus->completionReward += "				}	\n";
-	newFocus->completionReward += "				add_tech_bonus = {\n";
-	newFocus->completionReward += "					name = infantry_weapons_bonus\n";
-	newFocus->completionReward += "					bonus = 0.5\n";
-	newFocus->completionReward += "					uses = 1\n";
-	newFocus->completionReward += "					category = infantry_weapons\n";
-	newFocus->completionReward += "					category = artillery\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-}
-
-HoI4FocusTree* HoI4FocusTree::makeCustomizedCopy(const HoI4Country* country) const
-{
-	HoI4FocusTree* newFocusTree = new HoI4FocusTree(country);
-
-	for (auto focus: focuses)
-	{
-		HoI4Focus* newFocus = focus->makeCustomizedCopy(newFocusTree->dstCountryTag);
-		newFocusTree->addFocus(newFocus);
-	}
-
-	return newFocusTree;
-}
-
-
-void HoI4FocusTree::addDemocracyNationalFocuses(HoI4Country* Home, vector<HoI4Country*> CountriesToContain, int XStart)
-{
-	double WTModifier = 1;
-	if (Home->getGovernment() == "democratic")
-	{
-		string warPol = Home->getRulingParty().war_pol;
-		if (warPol == "jingoism")
-			WTModifier = 0;
-		if (warPol == "pro_military")
-			WTModifier = 0.25;
-		if (warPol == "anti_military")
-			WTModifier = 0.5;
-	}
-	if (Home->getGovernment() == "hms_government")
-	{
-		string warPol = Home->getRulingParty().war_pol;
-		if (warPol == "jingoism")
-			WTModifier = 0;
-		if (warPol == "pro_military")
-			WTModifier = 0;
-		if (warPol == "anti_military")
-			WTModifier = 0.25;
-		if (warPol == "pacifism" || warPol == "pacifist")
-			WTModifier = 0.5;
-	}
-
-	//War Propoganda
-	HoI4Focus* newFocus = new HoI4Focus;
-	newFocus->id = "WarProp" + Home->getTag();
-	newFocus->icon = "GFX_goal_generic_propaganda";
-	newFocus->text += "War Propoganda";
-	newFocus->available += "			threat > " + to_string(0.2*WTModifier);
-	newFocus->xPos = XStart;
-	newFocus->yPos = 0;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 10";
-	newFocus->completionReward += "			add_ideas = militarism_focus";
-	focuses.push_back(newFocus);
-
-	//Prepare Intervention
-	newFocus = new HoI4Focus;
-	newFocus->id = "PrepInter" + Home->getTag();
-	newFocus->icon = "GFX_goal_generic_occupy_states_ongoing_war";
-	newFocus->text += "War Propoganda";
-	newFocus->prerequisites.push_back("focus = WarProp" + Home->getTag());
-	newFocus->available += "			threat > " + to_string(0.4 * WTModifier);
-	newFocus->xPos = XStart;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 10";
-	newFocus->completionReward += "			set_rule = { can_send_volunteers = yes }";
-	focuses.push_back(newFocus);
-
-	int offBalance = 0;
-	if (CountriesToContain.size() >= 2)
-		offBalance = -3;
-	if (CountriesToContain.size() == 1)
-		offBalance = -2;
-
-	//Limited Intervention
-	newFocus = new HoI4Focus;
-	newFocus->id = "Lim" + Home->getTag();
-	newFocus->icon = "GFX_goal_generic_more_territorial_claims";
-	newFocus->text += "Limited Intervention";
-	newFocus->prerequisites.push_back("focus = PrepInter" + Home->getTag());
-	newFocus->available += "			threat > " + to_string(0.8 * WTModifier);
-	newFocus->xPos = XStart + offBalance;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 10";
-	newFocus->completionReward += "			add_ideas = limited_interventionism\n";
-	newFocus->completionReward += "			set_rule = { can_send_volunteers = yes }";
-	focuses.push_back(newFocus);
-
-	int warPlannumber = 1;
-	//for (auto Country : CountriesToContain)
-
-	for (int i = CountriesToContain.size() - 1; i >= 0; i--)
-	{
-		HoI4Country* Country = CountriesToContain[i];
-		//War Plan
-		newFocus = new HoI4Focus;
-		newFocus->id = "WarPlan" + Home->getTag() + Country->getTag();
-		newFocus->icon = "GFX_goal_generic_position_armies";
-		newFocus->text += "War Plan " + Country->getSourceCountry()->getName("english");
-		newFocus->prerequisites.push_back("focus = PrepInter" + Home->getTag());
-		newFocus->available += "			" + Country->getTag() + " = { is_in_faction_with = " + Home->getTag() + " }\n";
-		newFocus->available += "			" + Country->getTag() + " = { has_added_tension_amount > 30 }";
-		newFocus->xPos = XStart + offBalance + warPlannumber * 2;
-		newFocus->yPos = 2;
-		newFocus->cost = 10;
-		newFocus->aiWillDo += "			factor = 10";
-		newFocus->completionReward += "			army_experience = 20\n";
-		newFocus->completionReward += "			add_tech_bonus = {\n";
-		newFocus->completionReward += "				name = land_doc_bonus\n";
-		newFocus->completionReward += "				bonus = 0.5\n";
-		newFocus->completionReward += "				uses = 1\n";
-		newFocus->completionReward += "				category = land_doctrine\n";
-		newFocus->completionReward += "			}";
-		focuses.push_back(newFocus);
-
-		//Embargo
-		newFocus = new HoI4Focus;
-		newFocus->id = "Embargo" + Home->getTag() + Country->getTag();
-		newFocus->icon = "GFX_goal_generic_trade";
-		newFocus->text += "Embargo " + Country->getSourceCountry()->getName("english");
-		newFocus->prerequisites.push_back("focus =  WarPlan" + Home->getTag() + Country->getTag());
-		newFocus->available += "			" + Country->getTag() + " = { is_in_faction_with = " + Home->getTag() + " }\n";
-		newFocus->available += "			" + Country->getTag() + " = { has_added_tension_amount > 30 }";
-		newFocus->xPos = XStart + offBalance + warPlannumber * 2;
-		newFocus->yPos = 3;
-		newFocus->cost = 10;
-		newFocus->aiWillDo += "			factor = 10";
-		newFocus->completionReward += "			" + Country->getTag() + " = {\n";
-		newFocus->completionReward += "				add_opinion_modifier = { target = " + Home->getTag() + " modifier = embargo }\n";
-		newFocus->completionReward += "			}";
-		focuses.push_back(newFocus);
-
-		//WAR
-		newFocus = new HoI4Focus;
-		newFocus->id = "WAR" + Home->getTag() + Country->getTag();
-		newFocus->icon = "GFX_goal_support_democracy";
-		newFocus->text += "Enact War Plan " + Country->getSourceCountry()->getName("english");
-		newFocus->available += "			" + Country->getTag() + " = { is_in_faction_with = " + Home->getTag() + " }";
-		newFocus->prerequisites.push_back("focus =  Embargo" + Home->getTag() + Country->getTag());
-		newFocus->prerequisites.push_back("focus =  Lim" + Home->getTag());
-		newFocus->xPos = XStart + offBalance + warPlannumber++ * 2;
-		newFocus->yPos = 4;
-		newFocus->cost = 10;
-		newFocus->aiWillDo += "			factor = 10";
-		newFocus->completionReward += "			create_wargoal = {\n";
-		newFocus->completionReward += "				type = puppet_wargoal_focus\n";
-		newFocus->completionReward += "				target = " + Country->getTag() + "\n";
-		newFocus->completionReward += "			}";
-		focuses.push_back(newFocus);
-	}
-}
-
-
-void HoI4FocusTree::addMonarchyEmpireNationalFocuses(HoI4Country* Home, const vector<HoI4Country*>& targetColonies, const vector<HoI4Country*>& annexationTargets)
-{
-	//Glory to Empire!
-	HoI4Focus* newFocus = new HoI4Focus;
-	newFocus->id = "EmpireGlory" + Home->getTag();
-	newFocus->icon = "GFX_goal_anschluss";
-	newFocus->text += "Glory to the Empire!";
-	//newFocus->available += "			is_puppet = no\n";
-	newFocus->xPos =  29;
-	newFocus->yPos = 0;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 10\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "				factor = 0\n";
-	newFocus->aiWillDo += "				date < 1937.6.6\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_national_unity = 0.1";
-	focuses.push_back(newFocus);
-
-	//Colonies Focus
-	newFocus = new HoI4Focus;
-	newFocus->id = "StrengthenColonies" + Home->getTag();
-	newFocus->icon = "GFX_goal_generic_position_armies";
-	newFocus->text += "Strengthen the Colonies";
-	newFocus->prerequisites.push_back("focus = EmpireGlory" + Home->getTag());
-	newFocus->mutuallyExclusive = "focus = StrengthenHome" + Home->getTag();
-	newFocus->xPos =  28;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 0\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			navy_experience = 25";
-	focuses.push_back(newFocus);
-
-	//Home Focus
-	newFocus = new HoI4Focus;
-	newFocus->id = "StrengthenHome" + Home->getTag();
-	newFocus->icon = "GFX_goal_generic_national_unity";
-	newFocus->text += "Strengthen Home";
-	newFocus->prerequisites.push_back("focus = EmpireGlory" + Home->getTag());
-	newFocus->mutuallyExclusive = "focus = StrengthenColonies" + Home->getTag();
-	newFocus->xPos =  30;
-	newFocus->yPos = 1;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 10\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			army_experience = 25";
-	focuses.push_back(newFocus);
-
-	//Colonial Factories
-	newFocus = new HoI4Focus;
-	newFocus->id = "ColonialInd" + Home->getTag();
-	newFocus->icon = "GFX_goal_generic_construct_civ_factory";
-	newFocus->text += "Colonial Industry Buildup";
-	newFocus->prerequisites.push_back("focus = StrengthenColonies" + Home->getTag());
-	newFocus->xPos =  26;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 10\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = arms_factory\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = no\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = industrial_complex\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = no\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = arms_factory\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = arms_factory\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = no\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = industrial_complex\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = no\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = arms_factory\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = arms_factory\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = no\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = industrial_complex\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = no\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = arms_factory\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	//Colonial Highway
-	newFocus = new HoI4Focus;
-	newFocus->id = "ColonialHwy" + Home->getTag();
-	newFocus->icon = "GFX_goal_generic_construct_infrastructure";
-	newFocus->text += "Colonial Highway";
-	newFocus->prerequisites.push_back("focus = ColonialInd" + Home->getTag());
-	newFocus->xPos =  24;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 10\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = infrastructure\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = no\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = infrastructure\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = no\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = infrastructure\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = infrastructure\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = no\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = infrastructure\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = no\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = infrastructure\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = infrastructure\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = no\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = infrastructure\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = no\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = infrastructure\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	//improve resources
-	newFocus = new HoI4Focus;
-	newFocus->id = "ResourceFac" + Home->getTag();
-	newFocus->icon = "GFX_goal_generic_oil_refinery";
-	newFocus->text += "Improve Resource Factories";
-	newFocus->prerequisites.push_back("focus = ColonialInd" + Home->getTag());
-	newFocus->mutuallyExclusive = "focus = StrengthenColonies" + Home->getTag();
-	newFocus->xPos =  26;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 10\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_ideas = improved_resource_industry";
-	focuses.push_back(newFocus);
-
-	//establish colonial army
-	newFocus = new HoI4Focus;
-	newFocus->id = "ColonialArmy" + Home->getTag();
-	newFocus->icon = "GFX_goal_generic_allies_build_infantry";
-	newFocus->text += "Establish Colonial Army";
-	newFocus->prerequisites.push_back("focus = StrengthenColonies" + Home->getTag());
-	newFocus->xPos =  28;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 10\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_ideas = militarism_focus";
-	focuses.push_back(newFocus);
-
-	//establish protectorate
-	if (targetColonies.size() >= 1)
-	{
-		auto target = targetColonies.front();
-
-		newFocus = new HoI4Focus;
-		newFocus->id = "Protectorate" + Home->getTag() + target->getTag();
-		newFocus->icon = "GFX_goal_generic_major_war";
-		newFocus->text += "Establish Protectorate over " + target->getSourceCountry()->getName("english");
-		newFocus->available += "			" + target->getTag() + " = { is_in_faction = no }";
-		newFocus->prerequisites.push_back("focus = ColonialArmy" + Home->getTag());
-		newFocus->xPos = 28;
-		newFocus->yPos = 3;
-		newFocus->cost = 10;
-		newFocus->bypass += "			OR = {\n";
-		newFocus->bypass += "				" + Home->getTag() + " = {\n";
-		newFocus->bypass += "					is_in_faction_with = " + target->getTag() +"\n";
-		newFocus->bypass += "					has_war_with = " + target->getTag() + "\n";
-		newFocus->bypass += "				}\n";
-		newFocus->bypass += "				NOT = { country_exists = " + target->getTag() + " }\n";
-		newFocus->bypass += "			}";
-		newFocus->aiWillDo += "			factor = 10\n";
-		newFocus->aiWillDo += "			modifier = {\n";
-		newFocus->aiWillDo += "				factor = 0\n";
-		newFocus->aiWillDo += "				strength_ratio = { tag = " + target->getTag() + " ratio < 1 }\n";
-		newFocus->aiWillDo += "			}";
-		newFocus->completionReward += "			create_wargoal = {\n";
-		newFocus->completionReward += "				type = annex_everything\n";
-		newFocus->completionReward += "				target = " + target->getTag() + "\n";
-		newFocus->completionReward += "			}";
-		focuses.push_back(newFocus);
-	}
-	if (targetColonies.size() >= 2)
-	{
-		auto target = targetColonies.back();
-
-		newFocus = new HoI4Focus;
-		newFocus->id = "Protectorate" + Home->getTag() + target->getTag();
-		newFocus->icon = "GFX_goal_generic_major_war";
-		newFocus->text += "Establish Protectorate over " + target->getSourceCountry()->getName("english");
-		newFocus->available += "			" + target->getTag() + " = { is_in_faction = no }";
-		newFocus->prerequisites.push_back("focus = Protectorate" + Home->getTag() + targetColonies.front()->getTag());
-		newFocus->xPos = 28;
-		newFocus->yPos = 4;
-		newFocus->cost = 10;
-		newFocus->bypass += "			OR = {\n";
-		newFocus->bypass += "				" + Home->getTag() + " = {\n";
-		newFocus->bypass += "					is_in_faction_with = " + target->getTag() +"\n";
-		newFocus->bypass += "					has_war_with = " + target->getTag() + "\n";
-		newFocus->bypass += "				}\n";
-		newFocus->bypass += "				NOT = { country_exists = " + target->getTag() + " }\n";
-		newFocus->bypass += "			}";
-		newFocus->aiWillDo += "			factor = 5\n";
-		newFocus->aiWillDo += "			modifier = {\n";
-		newFocus->aiWillDo += "				factor = 0\n";
-		newFocus->aiWillDo += "				strength_ratio = { tag = " + target->getTag() + " ratio < 1 }\n";
-		newFocus->aiWillDo += "			}";
-		newFocus->completionReward += "			create_wargoal = {\n";
-		newFocus->completionReward += "				type = annex_everything\n";
-		newFocus->completionReward += "				target = " + target->getTag() + "\n";
-		newFocus->completionReward += "			}";
-		focuses.push_back(newFocus);
-	}
-
-	//Trade Empire
-	newFocus = new HoI4Focus;
-	newFocus->id = "TradeEmpire" + Home->getTag();
-	newFocus->icon = "GFX_goal_anschluss";
-	newFocus->text += "Fund the " + Home->getSourceCountry()->getAdjective("english") + " Colonial Trade Corporation";
-	newFocus->prerequisites.push_back("focus = ColonialHwy" + Home->getTag() + " focus = ResourceFac" + Home->getTag());
-	newFocus->xPos =  25;
-	newFocus->yPos = 4;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 10\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_ideas = established_traders";
-	newFocus->completionReward += "			set_country_flag = established_traders";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = infrastructure\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = no\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = infrastructure\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = no\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 2\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = dockyard\n";
-	newFocus->completionReward += "					level = 2\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	//Home Industry Buildup
-	newFocus = new HoI4Focus;
-	newFocus->id = "IndHome" + Home->getTag();
-	newFocus->icon = "GFX_goal_generic_production";
-	newFocus->text += "Fund Industrial Improvement";
-	newFocus->prerequisites.push_back("focus = StrengthenHome" + Home->getTag());
-	newFocus->xPos =  31;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 10";
-	//newFocus->completionReward += "			research_time_factor = -0.1;
-	focuses.push_back(newFocus);
-
-	//National Highway
-	newFocus = new HoI4Focus;
-	newFocus->id = "NationalHwy" + Home->getTag();
-	newFocus->icon = "GFX_goal_generic_construct_infrastructure";
-	newFocus->text += "National Highway";
-	newFocus->prerequisites.push_back("focus = IndHome" + Home->getTag());
-	newFocus->xPos =  30;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 10\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = infrastructure\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = infrastructure\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = infrastructure\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = infrastructure\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = infrastructure\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = infrastructure\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = infrastructure\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = infrastructure\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = infrastructure\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	//National College
-	newFocus = new HoI4Focus;
-	newFocus->id = "NatCollege" + Home->getTag();
-	newFocus->icon = "GFX_goal_anschluss";
-	newFocus->text += "Establish National College";
-	newFocus->prerequisites.push_back("focus = IndHome" + Home->getTag());
-	newFocus->xPos =  32;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 10";
-	newFocus->completionReward += "			add_ideas = national_college";
-	focuses.push_back(newFocus);
-
-	//Improve Factories
-	newFocus = new HoI4Focus;
-	newFocus->id = "MilitaryBuildup" + Home->getTag();
-	newFocus->icon = "GFX_goal_generic_construct_mil_factory";
-	newFocus->text += "Military Buildup";
-	newFocus->prerequisites.push_back("focus = NatCollege" + Home->getTag());
-	newFocus->prerequisites.push_back("focus = NationalHwy" + Home->getTag());
-	newFocus->xPos =  31;
-	newFocus->yPos = 4;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 10\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = arms_factory\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = arms_factory\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = arms_factory\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = arms_factory\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = arms_factory\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = arms_factory\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}\n";
-	newFocus->completionReward += "			random_owned_state = {\n";
-	newFocus->completionReward += "				limit = {\n";
-	newFocus->completionReward += "					free_building_slots = {\n";
-	newFocus->completionReward += "						building = arms_factory\n";
-	newFocus->completionReward += "						size > 0\n";
-	newFocus->completionReward += "						include_locked = yes\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "					OR = {\n";
-	newFocus->completionReward += "						is_in_home_area = yes\n";
-	newFocus->completionReward += "						NOT = {\n";
-	newFocus->completionReward += "							owner = {\n";
-	newFocus->completionReward += "								any_owned_state = {\n";
-	newFocus->completionReward += "									free_building_slots = {\n";
-	newFocus->completionReward += "										building = arms_factory\n";
-	newFocus->completionReward += "										size > 0\n";
-	newFocus->completionReward += "										include_locked = yes\n";
-	newFocus->completionReward += "									}\n";
-	newFocus->completionReward += "									is_in_home_area = yes\n";
-	newFocus->completionReward += "								}\n";
-	newFocus->completionReward += "							}\n";
-	newFocus->completionReward += "						}\n";
-	newFocus->completionReward += "					}\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
-	newFocus->completionReward += "				add_building_construction = {\n";
-	newFocus->completionReward += "					type = arms_factory\n";
-	newFocus->completionReward += "					level = 1\n";
-	newFocus->completionReward += "					instant_build = yes\n";
-	newFocus->completionReward += "				}\n";
-	newFocus->completionReward += "			}";
-	focuses.push_back(newFocus);
-
-	//PrepBorder
-	newFocus = new HoI4Focus;
-	newFocus->id = "PrepTheBorder" + Home->getTag();
-	newFocus->icon = "GFX_goal_generic_defence";
-	newFocus->text += "Prepare the Border";
-	newFocus->prerequisites.push_back("focus = StrengthenHome" + Home->getTag());
-	newFocus->xPos =  34;
-	newFocus->yPos = 2;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 10\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_ideas = border_buildup";
-	focuses.push_back(newFocus);
-
-	//Promote Nationalistic Spirit
-	newFocus = new HoI4Focus;
-	newFocus->id = "NatSpirit" + Home->getTag();
-	newFocus->icon = "GFX_goal_generic_political_pressure";
-	newFocus->text += "Promote Nationalistic Spirit";
-	newFocus->prerequisites.push_back("focus = PrepTheBorder" + Home->getTag());
-	newFocus->xPos =  34;
-	newFocus->yPos = 3;
-	newFocus->cost = 10;
-	newFocus->aiWillDo += "			factor = 10\n";
-	newFocus->aiWillDo += "			modifier = {\n";
-	newFocus->aiWillDo += "			}";
-	newFocus->completionReward += "			add_ideas = paramilitarism_focus";
-	focuses.push_back(newFocus);
-
-	//ANNEX
-	if (annexationTargets.size() >= 1)
-	{
-		auto target = annexationTargets.front();
-
-		newFocus = new HoI4Focus;
-		newFocus->id = "Annex" + Home->getTag() + target->getTag();
-		newFocus->icon = "GFX_goal_generic_major_war";
-		newFocus->text += "Conquer " + target->getSourceCountry()->getName("english");
-		newFocus->available += "			" + target->getTag() + " = { is_in_faction = no }";
-		newFocus->prerequisites.push_back("focus = PrepTheBorder" + Home->getTag());
-		newFocus->xPos = 36;
-		newFocus->yPos = 3;
-		newFocus->cost = 10;
-		newFocus->bypass += "			OR = {\n";
-		newFocus->bypass += "				" + Home->getTag() + " = {\n";
-		newFocus->bypass += "					is_in_faction_with = " + target->getTag() + "\n";
-		newFocus->bypass += "					has_war_with = " + target->getTag() + "\n";
-		newFocus->bypass += "				}\n";
-		newFocus->bypass += "				NOT = { country_exists = " + target->getTag() + " }\n";
-		newFocus->bypass += "			}";
-		newFocus->aiWillDo += "			factor = 5\n";
-		newFocus->aiWillDo += "			modifier = {\n";
-		newFocus->aiWillDo += "				factor = 0\n";
-		newFocus->aiWillDo += "				strength_ratio = { tag = " + target->getTag() + " ratio < 1 }\n";
-		newFocus->aiWillDo += "			}";
-		newFocus->completionReward += "			create_wargoal = {\n";
-		newFocus->completionReward += "				type = annex_everything\n";
-		newFocus->completionReward += "				target = " + target->getTag() + "\n";
-		newFocus->completionReward += "			}";
-		focuses.push_back(newFocus);
-	}
-	if (annexationTargets.size() >= 2)
-	{
-		auto target = annexationTargets.back();
-
-		newFocus = new HoI4Focus;
-		newFocus->id = "Annex" + Home->getTag() + target->getTag();
-		newFocus->icon = "GFX_goal_generic_major_war";
-		newFocus->text += "Conquer " + target->getSourceCountry()->getName("english");
-		newFocus->available += "			" + target->getTag() + " = { is_in_faction = no }";
-		newFocus->prerequisites.push_back("focus = NatSpirit" + Home->getTag());
-		newFocus->xPos = 34;
-		newFocus->yPos = 4;
-		newFocus->cost = 10;
-		newFocus->bypass += "			OR = {\n";
-		newFocus->bypass += "				" + Home->getTag() + " = {\n";
-		newFocus->bypass += "					is_in_faction_with = " + target->getTag() + "\n";
-		newFocus->bypass += "					has_war_with = " + target->getTag() + "\n";
-		newFocus->bypass += "				}\n";
-		newFocus->bypass += "				NOT = { country_exists = " + target->getTag() + " }\n";
-		newFocus->bypass += "			}";
-		newFocus->aiWillDo += "			factor = 5\n";
-		newFocus->aiWillDo += "			modifier = {\n";
-		newFocus->aiWillDo += "				factor = 0\n";
-		newFocus->aiWillDo += "				strength_ratio = { tag = " + target->getTag() + " ratio < 1 }\n";
-		newFocus->aiWillDo += "			}";
-		newFocus->completionReward += "			create_wargoal = {\n";
-		newFocus->completionReward += "				type = annex_everything\n";
-		newFocus->completionReward += "				target = " + target->getTag() + "\n";
-		newFocus->completionReward += "			}";
-		focuses.push_back(newFocus);
-	}
-}
-
-
-void HoI4FocusTree::output()
-{
-	if (!Utils::TryCreateFolder("Output/" + Configuration::getOutputName() + "/common/national_focus"))
-	{
-		LOG(LogLevel::Error) << "Could not create \"Output/" + Configuration::getOutputName() + "/common/national_focus\"";
-		exit(-1);
-	}
-
-	string filename("Output/" + Configuration::getOutputName() + "/common/national_focus/" + srcCountryTag + "_NF.txt");
-	ofstream out(filename);
-	if (!out.is_open())
-	{
-		LOG(LogLevel::Error) << "Could not create " << filename;
-		exit(-1);
-	}
-
-	out << "focus_tree = {\n";
-	out << "	id = " << dstCountryTag + "_focus\n";
-	out << "	\n";
-	out << "	country = {\n";
-	out << "		factor = 0\n";
-	out << "		\n";
-	out << "		modifier = {\n";
-	out << "			add = 10\n";
-	out << "			tag = " << dstCountryTag << "\n";
-	out << "		}\n";
-	out << "	}\n";
-	out << "	\n";
-	out << "	default = no\n";
-	out << "\n";
-
-	for (auto focus: focuses)
-	{
-		out << *focus;
-		out <<"\n";
-	}
-
-	out << "}";
-
-	out.close();
+/*Copyright (c) 2016 The Paradox Game Converters Project
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*/
+
+
+
+#include "HoI4FocusTree.h"
+#include "HoI4Country.h"
+#include "HoI4Focus.h"
+#include "../Configuration.h"
+#include "Log.h"
+#include "Object.h"
+#include "OSCompatibilityLayer.h"
+#include "ParadoxParserUTF8.h"
+#include <fstream>
+using namespace std;
+
+
+
+HoI4FocusTree::HoI4FocusTree()
+{
+}
+
+
+HoI4FocusTree::HoI4FocusTree(const HoI4Country* country)
+{
+	srcCountryTag = country->getSourceCountry()->getTag();
+	dstCountryTag = country->getTag();
+}
+
+
+void HoI4FocusTree::addGenericFocusTree()
+{
+/*	Object2* genericObj = processFile(Configuration::getHoI4Path() + "/common/national_focus/generic.txt");
+	vector<Object2*> focusTreeLeaves = genericObj->getLeaves();
+	vector<Object2*> focusObjects = focusTreeLeaves[0]->getValue("focus");
+	for (auto focusObject: focusObjects)
+	{
+		HoI4Focus* newFocus = new HoI4Focus(focusObject);
+		focuses.push_back(newFocus);
+	}*/
+
+	if (Configuration::getHOI4Version() >= HOI4Version("1.3.0"))
+	{
+		addVersion1_3GenericFocusTree();
+	}
+	else
+	{
+		addVersion1_0GenericFocusTree();
+	}
+}
+
+
+void HoI4FocusTree::addVersion1_0GenericFocusTree()
+{
+	HoI4Focus* newFocus = new HoI4Focus;
+	newFocus->id = "army_effort";
+	newFocus->icon = "GFX_goal_generic_allies_build_infantry";
+	newFocus->xPos = 1;
+	newFocus->yPos = 0;
+	newFocus->cost = 10;
+	newFocus->completionReward =  "			army_experience = 5\n";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = land_doc_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = land_doctrine\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "equipment_effort";
+	newFocus->icon = "GFX_goal_generic_small_arms";
+	newFocus->prerequisites.push_back("focus = army_effort");
+	newFocus->xPos = 0;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->completionReward =  "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = infantry_weapons_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = infantry_weapons\n";
+	newFocus->completionReward += "				category = artillery\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "motorization_effort";
+	newFocus->icon = "GFX_goal_generic_army_motorized";
+	newFocus->prerequisites.push_back("focus = army_effort");
+	newFocus->bypass = "			has_tech = motorised_infantry";
+	newFocus->xPos = 2;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->completionReward =  "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = motorized_bonus\n";
+	newFocus->completionReward += "				bonus = 0.75\n";
+	newFocus->completionReward += "				technology = motorised_infantry\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "doctrine_effort";
+	newFocus->icon = "GFX_goal_generic_army_doctrines";
+	newFocus->prerequisites.push_back("focus = army_effort");
+	newFocus->xPos = 1;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->completionReward  = "			army_experience = 5\n";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = land_doc_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = land_doctrine\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "equipment_effort_2";
+	newFocus->icon = "GFX_goal_generic_army_artillery";
+	newFocus->prerequisites.push_back("focus = equipment_effort");
+	newFocus->xPos = 0;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->completionReward  = "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = infantry_artillery_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = infantry_weapons\n";
+	newFocus->completionReward += "				category = artillery\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "mechanization_effort";
+	newFocus->icon = "GFX_goal_generic_build_tank";
+	newFocus->prerequisites.push_back("focus = motorization_effort");
+	newFocus->xPos = 2;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->completionReward  = "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = motorized_bonus\n";
+	newFocus->completionReward += "				ahead_reduction = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = motorized_equipment\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "doctrine_effort_2";
+	newFocus->icon = "GFX_goal_generic_army_doctrines";
+	newFocus->prerequisites.push_back("focus = doctrine_effort");
+	newFocus->xPos = 1;
+	newFocus->yPos = 4;
+	newFocus->cost = 10;
+	newFocus->completionReward  = "			army_experience = 5\n";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = land_doc_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = land_doctrine\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "equipment_effort_3";
+	newFocus->icon = "GFX_goal_generic_army_artillery2";
+	newFocus->prerequisites.push_back("focus = equipment_effort_2");
+	newFocus->xPos = 0;
+	newFocus->yPos = 5;
+	newFocus->cost = 10;
+	newFocus->completionReward  = "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = infantry_artillery_bonus\n";
+	newFocus->completionReward += "				ahead_reduction = 1\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = infantry_weapons\n";
+	newFocus->completionReward += "				category = artillery\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "armor_effort";
+	newFocus->icon = "GFX_goal_generic_army_tanks";
+	newFocus->prerequisites.push_back("focus = mechanization_effort");
+	newFocus->xPos = 2;
+	newFocus->yPos = 5;
+	newFocus->cost = 10;
+	newFocus->completionReward  = "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = armor_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 2\n";
+	newFocus->completionReward += "				category = armor\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "special_forces";
+	newFocus->icon = "GFX_goal_generic_special_forces";
+	newFocus->prerequisites.push_back("focus = equipment_effort_3");
+	newFocus->prerequisites.push_back("focus = doctrine_effort_2");
+	newFocus->prerequisites.push_back("focus = armor_effort");
+	newFocus->xPos = 1;
+	newFocus->yPos = 6;
+	newFocus->cost = 10;
+	newFocus->completionReward  = "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = special_forces_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				technology = paratroopers\n";
+	newFocus->completionReward += "				technology = paratroopers2\n";
+	newFocus->completionReward += "				technology = marines\n";
+	newFocus->completionReward += "				technology = marines2\n";
+	newFocus->completionReward += "				technology = tech_mountaineers\n";
+	newFocus->completionReward += "				technology = tech_mountaineers2\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "aviation_effort";
+	newFocus->icon = "GFX_goal_generic_build_airforce";
+	newFocus->xPos = 5;
+	newFocus->yPos = 0;
+	newFocus->cost = 10;
+	newFocus->completeTooltip  = "			air_experience = 25\n";
+	newFocus->completeTooltip += "			if = { limit = { has_country_flag = aviation_effort_AB }\n";
+	newFocus->completeTooltip += "				add_building_construction = {\n";
+	newFocus->completeTooltip += "					type = air_base\n";
+	newFocus->completeTooltip += "					level = 2\n";
+	newFocus->completeTooltip += "					instant_build = yes\n";
+	newFocus->completeTooltip += "				}\n";
+	newFocus->completeTooltip += "			}			\n";
+	newFocus->completeTooltip += "			add_tech_bonus = {\n";
+	newFocus->completeTooltip += "				name = air_doc_bonus\n";
+	newFocus->completeTooltip += "				bonus = 0.5\n";
+	newFocus->completeTooltip += "				uses = 1\n";
+	newFocus->completeTooltip += "				category = air_doctrine\n";
+	newFocus->completeTooltip += "			}			";
+	newFocus->completionReward += "			air_experience = 25\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					capital_scope = {\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							free_building_slots = {\n";
+	newFocus->completionReward += "								building = air_base\n";
+	newFocus->completionReward += "								size > 1\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				random_owned_state = {\n";
+	newFocus->completionReward += "					limit = {\n";
+	newFocus->completionReward += "						free_building_slots = {\n";
+	newFocus->completionReward += "							building = air_base\n";
+	newFocus->completionReward += "							size > 1\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					add_building_construction = {\n";
+	newFocus->completionReward += "						type = air_base\n";
+	newFocus->completionReward += "						level = 2\n";
+	newFocus->completionReward += "						instant_build = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					ROOT = { set_country_flag = aviation_effort_AB }\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					capital_scope = {\n";
+	newFocus->completionReward += "						free_building_slots = {\n";
+	newFocus->completionReward += "							building = air_base\n";
+	newFocus->completionReward += "							size > 1\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				capital_scope = {\n";
+	newFocus->completionReward += "					add_building_construction = {\n";
+	newFocus->completionReward += "						type = air_base\n";
+	newFocus->completionReward += "						level = 2\n";
+	newFocus->completionReward += "						instant_build = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					ROOT = { set_country_flag = aviation_effort_AB }\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = air_doc_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = air_doctrine\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "fighter_focus";
+	newFocus->icon = "GFX_goal_generic_air_fighter";
+	newFocus->prerequisites.push_back("focus = aviation_effort");
+	newFocus->mutuallyExclusive = "focus = bomber_focus";
+	newFocus->xPos = 4;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = fighter_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 2\n";
+	newFocus->completionReward += "				technology = early_fighter\n";
+	newFocus->completionReward += "				technology = fighter1\n";
+	newFocus->completionReward += "				technology = fighter2\n";
+	newFocus->completionReward += "				technology = fighter3\n";
+	newFocus->completionReward += "				technology = heavy_fighter1\n";
+	newFocus->completionReward += "				technology = heavy_fighter2\n";
+	newFocus->completionReward += "				technology = heavy_fighter3\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "bomber_focus";
+	newFocus->icon = "GFX_goal_generic_air_bomber";
+	newFocus->prerequisites.push_back("focus = aviation_effort");
+	newFocus->mutuallyExclusive = "focus = fighter_focus";
+	newFocus->xPos = 6;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = bomber_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 2\n";
+	newFocus->completionReward += "				technology = strategic_bomber1\n";
+	newFocus->completionReward += "				technology = strategic_bomber2\n";
+	newFocus->completionReward += "				technology = strategic_bomber3\n";
+	newFocus->completionReward += "				category = tactical_bomber\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "aviation_effort_2";
+	newFocus->icon = "GFX_goal_generic_air_doctrine";
+	newFocus->prerequisites.push_back("focus = bomber_focus focus = fighter_focus");
+	newFocus->xPos = 5;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->completeTooltip += "			air_experience = 25\n";
+	newFocus->completeTooltip += "			if = { limit = { has_country_flag = aviation_effort_2_AB }\n";
+	newFocus->completeTooltip += "				add_building_construction = {\n";
+	newFocus->completeTooltip += "					type = air_base\n";
+	newFocus->completeTooltip += "					level = 2\n";
+	newFocus->completeTooltip += "					instant_build = yes\n";
+	newFocus->completeTooltip += "				}\n";
+	newFocus->completeTooltip += "			}\n";
+	newFocus->completeTooltip += "			add_tech_bonus = {\n";
+	newFocus->completeTooltip += "				name =  air_doc_bonus\n";
+	newFocus->completeTooltip += "				bonus = 0.5\n";
+	newFocus->completeTooltip += "				uses = 1\n";
+	newFocus->completeTooltip += "				category = air_doctrine\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			air_experience = 25\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					capital_scope = {\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							free_building_slots = {\n";
+	newFocus->completionReward += "								building = air_base\n";
+	newFocus->completionReward += "								size > 1\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				random_owned_state = {\n";
+	newFocus->completionReward += "					limit = {\n";
+	newFocus->completionReward += "						free_building_slots = {\n";
+	newFocus->completionReward += "							building = air_base\n";
+	newFocus->completionReward += "							size > 1\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					add_building_construction = {\n";
+	newFocus->completionReward += "						type = air_base\n";
+	newFocus->completionReward += "						level = 2\n";
+	newFocus->completionReward += "						instant_build = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					ROOT = { set_country_flag = aviation_effort_2_AB }\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					capital_scope = {\n";
+	newFocus->completionReward += "						free_building_slots = {\n";
+	newFocus->completionReward += "							building = air_base\n";
+	newFocus->completionReward += "							size > 1\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				capital_scope = {\n";
+	newFocus->completionReward += "					add_building_construction = {\n";
+	newFocus->completionReward += "						type = air_base\n";
+	newFocus->completionReward += "						level = 2\n";
+	newFocus->completionReward += "						instant_build = yes\n";
+	newFocus->completionReward += "					}				\n";
+	newFocus->completionReward += "					ROOT = { set_country_flag = aviation_effort_2_AB }\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name =  air_doc_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = air_doctrine\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "CAS_effort";
+	newFocus->icon = "GFX_goal_generic_CAS";
+	newFocus->prerequisites.push_back("focus = aviation_effort_2");
+	newFocus->prerequisites.push_back("focus = motorization_effort");
+	newFocus->xPos = 4;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = CAS_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				ahead_reduction = 1\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = cas_bomber\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "rocket_effort";
+	newFocus->icon = "GFX_focus_rocketry";
+	newFocus->prerequisites.push_back("focus = aviation_effort_2");
+	newFocus->prerequisites.push_back("focus = infrastructure_effort");
+	newFocus->xPos = 5;
+	newFocus->yPos = 4;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = jet_rocket_bonus\n";
+	newFocus->completionReward += "				ahead_reduction = 0.5\n";
+	newFocus->completionReward += "				uses = 2\n";
+	newFocus->completionReward += "				category = rocketry\n";
+	newFocus->completionReward += "				category = jet_technology\n";
+	newFocus->completionReward += "			}";
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0.25\n";
+	newFocus->aiWillDo += "				always = yes\n";
+	newFocus->aiWillDo += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "NAV_effort";
+	newFocus->icon = "GFX_goal_generic_air_naval_bomber";
+	newFocus->prerequisites.push_back("focus = aviation_effort_2");
+	newFocus->prerequisites.push_back("focus = flexible_navy");
+	newFocus->xPos = 6;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = nav_bomber_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				ahead_reduction = 1\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = naval_bomber\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "naval_effort";
+	newFocus->icon = "GFX_goal_generic_construct_naval_dockyard";
+	newFocus->xPos = 9;
+	newFocus->yPos = 0;
+	newFocus->cost = 10;
+	newFocus->available += "			any_state = {\n";
+	newFocus->available += "				is_coastal = yes\n";
+	newFocus->available += "				is_controlled_by = ROOT\n";
+	newFocus->available += "			}";
+	newFocus->completeTooltip += "			navy_experience = 25\n";
+	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 3\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = dockyard\n";
+	newFocus->completeTooltip += "				level = 3\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			navy_experience = 25\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					NOT = {\n";
+	newFocus->completionReward += "						any_owned_state = {\n";
+	newFocus->completionReward += "							dockyard > 0\n";
+	newFocus->completionReward += "							free_building_slots = {\n";
+	newFocus->completionReward += "								building = dockyard\n";
+	newFocus->completionReward += "								size > 2\n";
+	newFocus->completionReward += "								include_locked = yes\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					any_owned_state = {\n";
+	newFocus->completionReward += "						is_coastal = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				random_owned_state = {\n";
+	newFocus->completionReward += "					limit = {\n";
+	newFocus->completionReward += "						is_coastal = yes\n";
+	newFocus->completionReward += "						free_building_slots = {\n";
+	newFocus->completionReward += "							building = dockyard\n";
+	newFocus->completionReward += "							size > 2\n";
+	newFocus->completionReward += "							include_locked = yes\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					add_extra_state_shared_building_slots = 3\n";
+	newFocus->completionReward += "					add_building_construction = {\n";
+	newFocus->completionReward += "						type = dockyard\n";
+	newFocus->completionReward += "						level = 3\n";
+	newFocus->completionReward += "						instant_build = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				set_country_flag = naval_effort_built\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					NOT = { has_country_flag = naval_effort_built }\n";
+	newFocus->completionReward += "					any_owned_state = {\n";
+	newFocus->completionReward += "						dockyard > 0\n";
+	newFocus->completionReward += "						free_building_slots = {\n";
+	newFocus->completionReward += "							building = dockyard\n";
+	newFocus->completionReward += "							size > 2\n";
+	newFocus->completionReward += "							include_locked = yes\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				random_owned_state = {\n";
+	newFocus->completionReward += "					limit = {\n";
+	newFocus->completionReward += "						dockyard > 0\n";
+	newFocus->completionReward += "						free_building_slots = {\n";
+	newFocus->completionReward += "							building = dockyard\n";
+	newFocus->completionReward += "							size > 2\n";
+	newFocus->completionReward += "							include_locked = yes\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					add_extra_state_shared_building_slots = 3\n";
+	newFocus->completionReward += "					add_building_construction = {\n";
+	newFocus->completionReward += "						type = dockyard\n";
+	newFocus->completionReward += "						level = 3\n";
+	newFocus->completionReward += "						instant_build = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				set_country_flag = naval_effort_built\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					NOT = { has_country_flag = naval_effort_built }\n";
+	newFocus->completionReward += "					NOT = {\n";
+	newFocus->completionReward += "						any_owned_state = {\n";
+	newFocus->completionReward += "							free_building_slots = {\n";
+	newFocus->completionReward += "								building = dockyard\n";
+	newFocus->completionReward += "								size > 2\n";
+	newFocus->completionReward += "								include_locked = yes\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				random_state = {\n";
+	newFocus->completionReward += "					limit = {\n";
+	newFocus->completionReward += "						controller = { tag = ROOT }\n";
+	newFocus->completionReward += "						free_building_slots = {\n";
+	newFocus->completionReward += "							building = dockyard\n";
+	newFocus->completionReward += "							size > 2\n";
+	newFocus->completionReward += "							include_locked = yes\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					add_extra_state_shared_building_slots = 3\n";
+	newFocus->completionReward += "					add_building_construction = {\n";
+	newFocus->completionReward += "						type = dockyard\n";
+	newFocus->completionReward += "						level = 3\n";
+	newFocus->completionReward += "						instant_build = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "flexible_navy";
+	newFocus->icon = "GFX_goal_generic_build_navy";
+	newFocus->prerequisites.push_back("focus = naval_effort");
+	newFocus->mutuallyExclusive = "focus = large_navy";
+	newFocus->xPos = 8;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				all_owned_state = {\n";
+	newFocus->aiWillDo += "					OR = {\n";
+	newFocus->aiWillDo += "						is_coastal = no\n";
+	newFocus->aiWillDo += "						dockyard < 1\n";
+	newFocus->aiWillDo += "					}\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = sub_op_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 2\n";
+	newFocus->completionReward += "				technology = convoy_interdiction_ti\n";
+	newFocus->completionReward += "				technology = unrestricted_submarine_warfare\n";
+	newFocus->completionReward += "				technology = wolfpacks\n";
+	newFocus->completionReward += "				technology = advanced_submarine_warfare\n";
+	newFocus->completionReward += "				technology = combined_operations_raiding\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "large_navy";
+	newFocus->icon = "GFX_goal_generic_navy_doctrines_tactics";
+	newFocus->prerequisites.push_back("focus = naval_effort");
+	newFocus->mutuallyExclusive = "focus = flexible_navy";
+	newFocus->xPos = 10;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				all_owned_state = {\n";
+	newFocus->aiWillDo += "					OR = {\n";
+	newFocus->aiWillDo += "						is_coastal = no\n";
+	newFocus->aiWillDo += "						dockyard < 1\n";
+	newFocus->aiWillDo += "					}\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = fleet_in_being_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 2\n";
+	newFocus->completionReward += "				category = fleet_in_being_tree\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "submarine_effort";
+	newFocus->icon = "GFX_goal_generic_navy_submarine";
+	newFocus->prerequisites.push_back("focus = flexible_navy focus = large_navy");
+	newFocus->xPos = 8;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				all_owned_state = {\n";
+	newFocus->aiWillDo += "					OR = {\n";
+	newFocus->aiWillDo += "						is_coastal = no\n";
+	newFocus->aiWillDo += "						dockyard < 1\n";
+	newFocus->aiWillDo += "					}\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = ss_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				ahead_reduction = 1\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				technology = early_submarine\n";
+	newFocus->completionReward += "				technology = basic_submarine\n";
+	newFocus->completionReward += "				technology = improved_submarine\n";
+	newFocus->completionReward += "				technology = advanced_submarine\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "cruiser_effort";
+	newFocus->icon = "GFX_goal_generic_navy_cruiser";
+	newFocus->prerequisites.push_back("focus = large_navy focus = flexible_navy");
+	newFocus->xPos = 10;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				all_owned_state = {\n";
+	newFocus->aiWillDo += "					OR = {\n";
+	newFocus->aiWillDo += "						is_coastal = no\n";
+	newFocus->aiWillDo += "						dockyard < 1\n";
+	newFocus->aiWillDo += "					}\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = cr_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				ahead_reduction = 1\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				technology = improved_light_cruiser\n";
+	newFocus->completionReward += "				technology = advanced_light_cruiser\n";
+	newFocus->completionReward += "				technology = improved_heavy_cruiser\n";
+	newFocus->completionReward += "				technology = advanced_heavy_cruiser\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "destroyer_effort";
+	newFocus->icon = "GFX_goal_generic_wolf_pack";
+	newFocus->prerequisites.push_back("focus = submarine_effort");
+	newFocus->xPos = 8;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				all_owned_state = {\n";
+	newFocus->aiWillDo += "					OR = {\n";
+	newFocus->aiWillDo += "						is_coastal = no\n";
+	newFocus->aiWillDo += "						dockyard < 1\n";
+	newFocus->aiWillDo += "					}\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = dd_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				ahead_reduction = 1\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				technology = early_destroyer\n";
+	newFocus->completionReward += "				technology = basic_destroyer\n";
+	newFocus->completionReward += "				technology = improved_destroyer\n";
+	newFocus->completionReward += "				technology = advanced_destroyer\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "capital_ships_effort";
+	newFocus->icon = "GFX_goal_generic_navy_battleship";
+	newFocus->prerequisites.push_back("focus = cruiser_effort");
+	newFocus->xPos = 10;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				all_owned_state = {\n";
+	newFocus->aiWillDo += "					OR = {\n";
+	newFocus->aiWillDo += "						is_coastal = no\n";
+	newFocus->aiWillDo += "						dockyard < 1\n";
+	newFocus->aiWillDo += "					}\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			navy_experience = 25\n";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = capital_ships_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				ahead_reduction = 1\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				technology = basic_battlecruiser\n";
+	newFocus->completionReward += "				technology = basic_battleship\n";
+	newFocus->completionReward += "				technology = improved_battleship\n";
+	newFocus->completionReward += "				technology = advanced_battleship\n";
+	newFocus->completionReward += "				technology = heavy_battleship\n";
+	newFocus->completionReward += "				technology = heavy_battleship2\n";
+	newFocus->completionReward += "				technology = early_carrier\n";
+	newFocus->completionReward += "				technology = basic_carrier\n";
+	newFocus->completionReward += "				technology = improved_carrier\n";
+	newFocus->completionReward += "				technology = advanced_carrier\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "industrial_effort";
+	newFocus->icon = "GFX_goal_generic_production";
+	newFocus->xPos = 13;
+	newFocus->yPos = 0;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = industrial_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = industry\n";
+	newFocus->completionReward += "			}";
+	newFocus->aiWillDo += "			factor = 3\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				date < 1939.1.1\n";
+	newFocus->aiWillDo += "				OR = {\n";
+	newFocus->aiWillDo += "					# we also dont want tiny nations to go crazy with slots right away\n";
+	newFocus->aiWillDo += "					num_of_controlled_states < 2\n";
+	newFocus->aiWillDo += "				}				\n";
+	newFocus->aiWillDo += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "construction_effort";
+	newFocus->icon = "GFX_goal_generic_construct_civ_factory";
+	newFocus->prerequisites.push_back("focus = industrial_effort");
+	newFocus->xPos = 12;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 2";
+	newFocus->bypass += "			custom_trigger_tooltip = {\n";
+	newFocus->bypass += "				tooltip = construction_effort_tt\n";
+	newFocus->bypass += "				all_owned_state = {\n";
+	newFocus->bypass += "					free_building_slots = {\n";
+	newFocus->bypass += "						building = industrial_complex\n";
+	newFocus->bypass += "						size < 1\n";
+	newFocus->bypass += "						include_locked = yes\n";
+	newFocus->bypass += "					}					\n";
+	newFocus->bypass += "				}\n";
+	newFocus->bypass += "			}";
+	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = industrial_complex\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = industrial_complex\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = industrial_complex\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = industrial_complex\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "production_effort";
+	newFocus->icon = "GFX_goal_generic_construct_mil_factory";
+	newFocus->prerequisites.push_back("focus = industrial_effort");
+	newFocus->xPos = 14;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 2";
+	newFocus->bypass += "			custom_trigger_tooltip = {\n";
+	newFocus->bypass += "				tooltip = production_effort_tt\n";
+	newFocus->bypass += "				all_owned_state = {\n";
+	newFocus->bypass += "					free_building_slots = {\n";
+	newFocus->bypass += "						building = arms_factory\n";
+	newFocus->bypass += "						size < 1\n";
+	newFocus->bypass += "						include_locked = yes\n";
+	newFocus->bypass += "					}\n";
+	newFocus->bypass += "				}\n";
+	newFocus->bypass += "			}";
+	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = arms_factory\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = arms_factory\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = arms_factory\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = arms_factory\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "construction_effort_2";
+	newFocus->icon = "GFX_goal_generic_construct_civ_factory";
+	newFocus->prerequisites.push_back("focus = construction_effort");
+	newFocus->xPos = 12;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 2";
+	newFocus->bypass += "			custom_trigger_tooltip = {\n";
+	newFocus->bypass += "				tooltip = construction_effort_tt\n";
+	newFocus->bypass += "				all_owned_state = {\n";
+	newFocus->bypass += "					free_building_slots = {\n";
+	newFocus->bypass += "						building = industrial_complex\n";
+	newFocus->bypass += "						size < 1\n";
+	newFocus->bypass += "						include_locked = yes\n";
+	newFocus->bypass += "					}\n";
+	newFocus->bypass += "				}\n";
+	newFocus->bypass += "			}";
+	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = industrial_complex\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = industrial_complex\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = industrial_complex\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = industrial_complex\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "production_effort_2";
+	newFocus->icon = "GFX_goal_generic_construct_mil_factory";
+	newFocus->prerequisites.push_back("focus = production_effort");
+	newFocus->xPos = 14;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 2";
+	newFocus->bypass += "			custom_trigger_tooltip = {\n";
+	newFocus->bypass += "				tooltip = production_effort_tt\n";
+	newFocus->bypass += "				all_owned_state = {\n";
+	newFocus->bypass += "					free_building_slots = {\n";
+	newFocus->bypass += "						building = arms_factory\n";
+	newFocus->bypass += "						size < 1\n";
+	newFocus->bypass += "						include_locked = yes\n";
+	newFocus->bypass += "					}\n";
+	newFocus->bypass += "				}\n";
+	newFocus->bypass += "			}";
+	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = arms_factory\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = arms_factory\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = arms_factory\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = arms_factory\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "infrastructure_effort";
+	newFocus->icon = "GFX_goal_generic_construct_infrastructure";
+	newFocus->prerequisites.push_back("focus = construction_effort_2");
+	newFocus->xPos = 12;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->bypass += "			custom_trigger_tooltip = {\n";
+	newFocus->bypass += "				tooltip = infrastructure_effort_tt\n";
+	newFocus->bypass += "				all_owned_state = {			\n";
+	newFocus->bypass += "					free_building_slots = {\n";
+	newFocus->bypass += "						building = infrastructure\n";
+	newFocus->bypass += "						size < 1\n";
+	newFocus->bypass += "					}\n";
+	newFocus->bypass += "				}\n";
+	newFocus->bypass += "			}";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = infrastructure\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = infrastructure\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = infrastructure\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = infrastructure\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = infrastructure\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = infrastructure\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = infrastructure\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = infrastructure\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "production_effort_3";
+	newFocus->icon = "GFX_goal_generic_construct_mil_factory";
+	newFocus->prerequisites.push_back("focus = production_effort_2");
+	newFocus->xPos = 14;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 2";
+	newFocus->bypass += "			custom_trigger_tooltip = {\n";
+	newFocus->bypass += "				tooltip = production_effort_tt\n";
+	newFocus->bypass += "				all_owned_state = {\n";
+	newFocus->bypass += "					free_building_slots = {\n";
+	newFocus->bypass += "						building = arms_factory\n";
+	newFocus->bypass += "						size < 1\n";
+	newFocus->bypass += "						include_locked = yes\n";
+	newFocus->bypass += "					}\n";
+	newFocus->bypass += "				}\n";
+	newFocus->bypass += "			}";
+	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = arms_factory\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = arms_factory\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = arms_factory\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = arms_factory\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "infrastructure_effort_2";
+	newFocus->icon = "GFX_goal_generic_construct_infrastructure";
+	newFocus->prerequisites.push_back("focus = infrastructure_effort");
+	newFocus->xPos = 12;
+	newFocus->yPos = 4;
+	newFocus->cost = 10;
+	newFocus->bypass += "			custom_trigger_tooltip = {\n";
+	newFocus->bypass += "				tooltip = infrastructure_effort_tt\n";
+	newFocus->bypass += "				all_owned_state = {			\n";
+	newFocus->bypass += "					free_building_slots = {\n";
+	newFocus->bypass += "						building = infrastructure\n";
+	newFocus->bypass += "						size < 1\n";
+	newFocus->bypass += "					}\n";
+	newFocus->bypass += "				}\n";
+	newFocus->bypass += "			}";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = infrastructure\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = infrastructure\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = infrastructure\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = infrastructure\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = infrastructure\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = infrastructure\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = infrastructure\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = infrastructure\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "construction_effort_3";
+	newFocus->icon = "GFX_goal_generic_construct_civ_factory";
+	newFocus->prerequisites.push_back("focus = infrastructure_effort");
+	newFocus->xPos = 14;
+	newFocus->yPos = 4;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 2";
+	newFocus->bypass += "			custom_trigger_tooltip = {\n";
+	newFocus->bypass += "				tooltip = construction_effort_tt\n";
+	newFocus->bypass += "				all_owned_state = {\n";
+	newFocus->bypass += "					free_building_slots = {\n";
+	newFocus->bypass += "						building = industrial_complex\n";
+	newFocus->bypass += "						size < 2\n";
+	newFocus->bypass += "						include_locked = yes\n";
+	newFocus->bypass += "					}\n";
+	newFocus->bypass += "				}\n";
+	newFocus->bypass += "			}";
+	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 2\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = industrial_complex\n";
+	newFocus->completeTooltip += "				level = 2\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = industrial_complex\n";
+	newFocus->completionReward += "						size > 1\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = industrial_complex\n";
+	newFocus->completionReward += "										size > 1\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 2\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = industrial_complex\n";
+	newFocus->completionReward += "					level = 2\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "nuclear_effort";
+	newFocus->icon = "GFX_focus_wonderweapons";
+	newFocus->prerequisites.push_back("focus = infrastructure_effort_2");
+	newFocus->xPos = 10;
+	newFocus->yPos = 5;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = nuclear_bonus\n";
+	newFocus->completionReward += "				ahead_reduction = 0.5\n";
+	newFocus->completionReward += "				category = nuclear\n";
+	newFocus->completionReward += "			}";
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0.25\n";
+	newFocus->aiWillDo += "				always = yes\n";
+	newFocus->aiWillDo += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "extra_tech_slot";
+	newFocus->icon = "GFX_focus_research";
+	newFocus->prerequisites.push_back("focus = infrastructure_effort_2");
+	newFocus->xPos = 12;
+	newFocus->yPos = 5;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_research_slot = 1";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "extra_tech_slot_2";
+	newFocus->icon = "GFX_focus_research";
+	newFocus->prerequisites.push_back("focus = extra_tech_slot");
+	newFocus->available += "			num_of_factories > 50";
+	newFocus->cancelIfInvalid += "no";
+	newFocus->continueIfInvalid += "yes";
+	newFocus->xPos = 12;
+	newFocus->yPos = 6;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_research_slot = 1";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "secret_weapons";
+	newFocus->icon = "GFX_goal_generic_secret_weapon";
+	newFocus->prerequisites.push_back("focus = infrastructure_effort_2");
+	newFocus->xPos = 14;
+	newFocus->yPos = 5;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = secret_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 4\n";
+	newFocus->completionReward += "				category = electronics\n";
+	newFocus->completionReward += "				category = nuclear\n";
+	newFocus->completionReward += "				category = rocketry\n";
+	newFocus->completionReward += "			}";
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0.25\n";
+	newFocus->aiWillDo += "				always = yes\n";
+	newFocus->aiWillDo += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "political_effort";
+	newFocus->icon = "GFX_goal_generic_demand_territory";
+	newFocus->xPos = 19;
+	newFocus->yPos = 0;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_political_power = 120";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "collectivist_ethos";
+	newFocus->icon = "GFX_goal_generic_national_unity #icon = GFX_goal_tripartite_pact";
+	newFocus->prerequisites.push_back("focus = political_effort");
+	newFocus->mutuallyExclusive = "focus = liberty_ethos";
+	newFocus->available += "			OR = {\n";
+	newFocus->available += "				has_government = fascism\n";
+	newFocus->available += "				has_government = communism\n";
+	newFocus->available += "				has_government = neutrality\n";
+	newFocus->available += "			}";
+	newFocus->xPos = 18;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 5\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				OR = {\n";
+	newFocus->aiWillDo += "					is_historical_focus_on = yes\n";
+	newFocus->aiWillDo += "					has_idea = neutrality_idea\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_ideas = collectivist_ethos_focus";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "nationalism_focus";
+	newFocus->icon = "GFX_goal_support_fascism #icon = GFX_goal_tripartite_pact";
+	newFocus->prerequisites.push_back("focus = collectivist_ethos");
+	newFocus->mutuallyExclusive = "focus = internationalism_focus";
+	newFocus->available += "			OR = {\n";
+	newFocus->available += "				has_government = fascism\n";
+	newFocus->available += "				has_government = neutrality\n";
+	newFocus->available += "			}";
+	newFocus->xPos = 16;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 5\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 2\n";
+	newFocus->aiWillDo += "				any_neighbor_country = {\n";
+	newFocus->aiWillDo += "					is_major = yes\n";
+	newFocus->aiWillDo += "					has_government = fascism\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_ideas = nationalism";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "internationalism_focus";
+	newFocus->icon = "GFX_goal_support_communism #icon = GFX_goal_tripartite_pact";
+	newFocus->prerequisites.push_back("focus = collectivist_ethos");
+	newFocus->mutuallyExclusive = "focus = nationalism_focus";
+	newFocus->available += "			OR = {\n";
+	newFocus->available += "				has_government = communism\n";
+	newFocus->available += "				has_government = neutrality\n";
+	newFocus->available += "			}";
+	newFocus->xPos = 18;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 5\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 2\n";
+	newFocus->aiWillDo += "				any_neighbor_country = {\n";
+	newFocus->aiWillDo += "					is_major = yes\n";
+	newFocus->aiWillDo += "					has_government = communism\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_ideas = internationalism";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "liberty_ethos";
+	newFocus->icon = "GFX_goal_support_democracy";
+	newFocus->prerequisites.push_back("focus = political_effort");
+	newFocus->mutuallyExclusive = "focus = collectivist_ethos";
+	newFocus->available += "			OR = {\n";
+	newFocus->available += "				has_government = democratic\n";
+	newFocus->available += "				has_government = neutrality\n";
+	newFocus->available += "			}";
+	newFocus->xPos = 20;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 95\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0.1\n";
+	newFocus->aiWillDo += "				any_neighbor_country = {\n";
+	newFocus->aiWillDo += "					is_major = yes\n";
+	newFocus->aiWillDo += "					OR = {\n";
+	newFocus->aiWillDo += "						has_government = communism\n";
+	newFocus->aiWillDo += "						has_government = fascism\n";
+	newFocus->aiWillDo += "					}\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "				NOT = {\n";
+	newFocus->aiWillDo += "					any_neighbor_country = {\n";
+	newFocus->aiWillDo += "						is_major = yes\n";
+	newFocus->aiWillDo += "						has_government = democratic\n";
+	newFocus->aiWillDo += "					}\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_ideas = liberty_ethos_focus";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "militarism";
+	newFocus->icon = "GFX_goal_generic_political_pressure";
+	newFocus->prerequisites.push_back("focus = nationalism_focus");
+	newFocus->xPos = 16;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { has_idea = neutrality_idea }\n";
+	newFocus->completionReward += "				remove_ideas = neutrality_idea\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			add_ideas = militarism_focus\n";
+	newFocus->completionReward += "			army_experience = 20\n";
+	newFocus->completionReward += "			set_rule = { can_send_volunteers = yes }";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "political_correctness";
+	newFocus->icon = "GFX_goal_generic_dangerous_deal";
+	newFocus->prerequisites.push_back("focus = internationalism_focus");
+	newFocus->xPos = 18;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { has_idea = neutrality_idea }\n";
+	newFocus->completionReward += "				remove_ideas = neutrality_idea\n";
+	newFocus->completionReward += "			}		\n";
+	newFocus->completionReward += "			add_political_power = 200\n";
+	newFocus->completionReward += "			add_ideas = idea_political_correctness";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "neutrality_focus";
+	newFocus->icon = "GFX_goal_generic_neutrality_focus";
+	newFocus->prerequisites.push_back("focus = liberty_ethos");
+	newFocus->mutuallyExclusive = "focus = interventionism_focus";
+	newFocus->xPos = 20;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { NOT = { has_idea = neutrality_idea } }\n";
+	newFocus->completionReward += "				add_ideas = neutrality_idea\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			add_political_power = 150";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "interventionism_focus";
+	newFocus->icon = "GFX_goal_generic_political_pressure";
+	newFocus->prerequisites.push_back("focus = liberty_ethos");
+	newFocus->mutuallyExclusive = "focus = neutrality_focus";
+	newFocus->xPos = 22;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				has_idea = neutrality_idea\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { has_idea = neutrality_idea }\n";
+	newFocus->completionReward += "				remove_ideas = neutrality_idea\n";
+	newFocus->completionReward += "			}	\n";
+	newFocus->completionReward += "			set_rule = { can_send_volunteers = yes }\n";
+	newFocus->completionReward += "			add_political_power = 150";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "military_youth";
+	newFocus->icon = "GFX_goal_generic_more_territorial_claims";
+	newFocus->prerequisites.push_back("focus = militarism");
+	newFocus->xPos = 16;
+	newFocus->yPos = 4;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_ideas = military_youth_focus\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { has_government = fascism }\n";
+	newFocus->completionReward += "				add_popularity = {\n";
+	newFocus->completionReward += "					ideology = fascism\n";
+	newFocus->completionReward += "					popularity = 0.2\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { has_government = communism }\n";
+	newFocus->completionReward += "				add_popularity = {\n";
+	newFocus->completionReward += "					ideology = communism\n";
+	newFocus->completionReward += "					popularity = 0.2\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "deterrence";
+	newFocus->icon = "GFX_goal_generic_defence";
+	newFocus->prerequisites.push_back("focus = neutrality_focus");
+	newFocus->xPos = 20;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_ideas = deterrence";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "volunteer_corps";
+	newFocus->icon = "GFX_goal_generic_allies_build_infantry";
+	newFocus->prerequisites.push_back("focus = interventionism_focus");
+	newFocus->xPos = 22;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_ideas = volunteer_corps_focus";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "paramilitarism";
+	newFocus->icon = "GFX_goal_generic_military_sphere";
+	newFocus->prerequisites.push_back("focus = military_youth");
+	newFocus->xPos = 16;
+	newFocus->yPos = 5;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_ideas = paramilitarism_focus";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "indoctrination_focus";
+	newFocus->icon = "GFX_goal_generic_propaganda";
+	newFocus->prerequisites.push_back("focus = political_correctness");
+	newFocus->xPos = 18;
+	newFocus->yPos = 4;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_ideas = indoctrination_focus\n";
+	newFocus->completionReward += "			add_political_power = 150";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "foreign_expeditions";
+	newFocus->icon = "GFX_goal_generic_more_territorial_claims";
+	newFocus->prerequisites.push_back("focus = volunteer_corps");
+	newFocus->xPos = 22;
+	newFocus->yPos = 4;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_ideas = foreign_expeditions_focus";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "why_we_fight";
+	newFocus->icon = "GFX_goal_generic_propaganda";
+	newFocus->prerequisites.push_back("focus = foreign_expeditions focus = deterrence");
+	newFocus->available += "			OR = {\n";
+	newFocus->available += "				threat > 0.75\n";
+	newFocus->available += "				has_defensive_war = yes\n";
+	newFocus->available += "			}";
+	newFocus->continueIfInvalid += "yes";
+	newFocus->xPos = 20;
+	newFocus->yPos = 5;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { NOT = { has_idea = neutrality_idea } }\n";
+	newFocus->completionReward += "				set_rule = { can_create_factions = yes }\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			add_ideas = why_we_fight_focus";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "political_commissars";
+	newFocus->icon = "GFX_goal_generic_forceful_treaty";
+	newFocus->prerequisites.push_back("focus = indoctrination_focus");
+	newFocus->available = " ";
+	newFocus->xPos = 18;
+	newFocus->yPos = 5;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_ideas = political_commissars_focus\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { has_government = fascism }\n";
+	newFocus->completionReward += "				add_popularity = {\n";
+	newFocus->completionReward += "					ideology = fascism\n";
+	newFocus->completionReward += "					popularity = 0.2\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { has_government = communism }\n";
+	newFocus->completionReward += "				add_popularity = {\n";
+	newFocus->completionReward += "					ideology = communism\n";
+	newFocus->completionReward += "					popularity = 0.2\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			add_political_power = 200";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "ideological_fanaticism";
+	newFocus->icon = "GFX_goal_generic_demand_territory";
+	newFocus->prerequisites.push_back("focus = paramilitarism focus = political_commissars");
+	newFocus->xPos = 17;
+	newFocus->yPos = 6;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			add_ideas = ideological_fanaticism_focus\n";
+	newFocus->completionReward += "			set_rule = {\n";
+	newFocus->completionReward += "				can_create_factions = yes\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			hidden_effect = {\n";
+	newFocus->completionReward += "				set_rule = { can_use_kamikaze_pilots = yes }\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			custom_effect_tooltip = kamikaze_focus_tooltip";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "technology_sharing";
+	newFocus->icon = "GFX_goal_generic_scientific_exchange";
+	newFocus->prerequisites.push_back("focus = ideological_fanaticism focus = why_we_fight");
+	newFocus->available += "			has_war = yes\n";
+	newFocus->available += "			is_in_faction = yes\n";
+	newFocus->available += "			OR = {\n";
+	newFocus->available += "				num_of_factories > 50\n";
+	newFocus->available += "				any_country = {\n";
+	newFocus->available += "					is_in_faction_with = ROOT\n";
+	newFocus->available += "					num_of_factories > 50\n";
+	newFocus->available += "				}\n";
+	newFocus->available += "			}";
+	newFocus->xPos = 19;
+	newFocus->yPos = 7;
+	newFocus->cost = 10;
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					original_research_slots < 3\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_research_slot = 1\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					original_research_slots > 2\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_tech_bonus = {\n";
+	newFocus->completionReward += "					name = electronics_bonus\n";
+	newFocus->completionReward += "					bonus = 0.5\n";
+	newFocus->completionReward += "					uses = 1\n";
+	newFocus->completionReward += "					category = electronics\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_tech_bonus = {\n";
+	newFocus->completionReward += "					name = industrial_bonus\n";
+	newFocus->completionReward += "					bonus = 0.5\n";
+	newFocus->completionReward += "					uses = 1\n";
+	newFocus->completionReward += "					category = industry\n";
+	newFocus->completionReward += "				}	\n";
+	newFocus->completionReward += "				add_tech_bonus = {\n";
+	newFocus->completionReward += "					name = infantry_weapons_bonus\n";
+	newFocus->completionReward += "					bonus = 0.5\n";
+	newFocus->completionReward += "					uses = 1\n";
+	newFocus->completionReward += "					category = infantry_weapons\n";
+	newFocus->completionReward += "					category = artillery\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+}
+
+
+void HoI4FocusTree::addVersion1_3GenericFocusTree()
+{
+	HoI4Focus* newFocus = new HoI4Focus;
+	newFocus->id = "army_effort";
+	newFocus->icon = "GFX_goal_generic_allies_build_infantry";
+	newFocus->xPos = 1;
+	newFocus->yPos = 0;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward =  "			army_experience = 5\n";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = land_doc_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = land_doctrine\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "equipment_effort";
+	newFocus->icon = "GFX_goal_generic_small_arms";
+	newFocus->prerequisites.push_back("focus = army_effort");
+	newFocus->xPos = 0;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward =  "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = infantry_weapons_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = infantry_weapons\n";
+	newFocus->completionReward += "				category = artillery\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "motorization_effort";
+	newFocus->icon = "GFX_goal_generic_army_motorized";
+	newFocus->prerequisites.push_back("focus = army_effort");
+	newFocus->bypass = "			has_tech = motorised_infantry";
+	newFocus->xPos = 2;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward =  "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = motorized_bonus\n";
+	newFocus->completionReward += "				bonus = 0.75\n";
+	newFocus->completionReward += "				technology = motorised_infantry\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "doctrine_effort";
+	newFocus->icon = "GFX_goal_generic_army_doctrines";
+	newFocus->prerequisites.push_back("focus = army_effort");
+	newFocus->xPos = 1;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward  = "			army_experience = 5\n";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = land_doc_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = land_doctrine\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "equipment_effort_2";
+	newFocus->icon = "GFX_goal_generic_army_artillery";
+	newFocus->prerequisites.push_back("focus = equipment_effort");
+	newFocus->xPos = 0;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward  = "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = infantry_artillery_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = infantry_weapons\n";
+	newFocus->completionReward += "				category = artillery\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "mechanization_effort";
+	newFocus->icon = "GFX_goal_generic_build_tank";
+	newFocus->prerequisites.push_back("focus = motorization_effort");
+	newFocus->xPos = 2;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward  = "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = motorized_bonus\n";
+	newFocus->completionReward += "				ahead_reduction = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = motorized_equipment\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "doctrine_effort_2";
+	newFocus->icon = "GFX_goal_generic_army_doctrines";
+	newFocus->prerequisites.push_back("focus = doctrine_effort");
+	newFocus->xPos = 1;
+	newFocus->yPos = 4;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward  = "			army_experience = 5\n";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = land_doc_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = land_doctrine\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "equipment_effort_3";
+	newFocus->icon = "GFX_goal_generic_army_artillery2";
+	newFocus->prerequisites.push_back("focus = equipment_effort_2");
+	newFocus->xPos = 0;
+	newFocus->yPos = 5;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward  = "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = infantry_artillery_bonus\n";
+	newFocus->completionReward += "				ahead_reduction = 1\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = infantry_weapons\n";
+	newFocus->completionReward += "				category = artillery\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "armor_effort";
+	newFocus->icon = "GFX_goal_generic_army_tanks";
+	newFocus->prerequisites.push_back("focus = mechanization_effort");
+	newFocus->xPos = 2;
+	newFocus->yPos = 5;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward  = "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = armor_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 2\n";
+	newFocus->completionReward += "				category = armor\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "special_forces";
+	newFocus->icon = "GFX_goal_generic_special_forces";
+	newFocus->prerequisites.push_back("focus = equipment_effort_3");
+	newFocus->prerequisites.push_back("focus = doctrine_effort_2");
+	newFocus->prerequisites.push_back("focus = armor_effort");
+	newFocus->xPos = 1;
+	newFocus->yPos = 6;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward  = "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = special_forces_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				technology = paratroopers\n";
+	newFocus->completionReward += "				technology = paratroopers2\n";
+	newFocus->completionReward += "				technology = marines\n";
+	newFocus->completionReward += "				technology = marines2\n";
+	newFocus->completionReward += "				technology = tech_mountaineers\n";
+	newFocus->completionReward += "				technology = tech_mountaineers2\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "aviation_effort";
+	newFocus->icon = "GFX_goal_generic_build_airforce";
+	newFocus->xPos = 5;
+	newFocus->yPos = 0;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completeTooltip  = "			air_experience = 25\n";
+	newFocus->completeTooltip += "			if = { limit = { has_country_flag = aviation_effort_AB }\n";
+	newFocus->completeTooltip += "				add_building_construction = {\n";
+	newFocus->completeTooltip += "					type = air_base\n";
+	newFocus->completeTooltip += "					level = 2\n";
+	newFocus->completeTooltip += "					instant_build = yes\n";
+	newFocus->completeTooltip += "				}\n";
+	newFocus->completeTooltip += "			}			\n";
+	newFocus->completeTooltip += "			add_tech_bonus = {\n";
+	newFocus->completeTooltip += "				name = air_doc_bonus\n";
+	newFocus->completeTooltip += "				bonus = 0.5\n";
+	newFocus->completeTooltip += "				uses = 1\n";
+	newFocus->completeTooltip += "				category = air_doctrine\n";
+	newFocus->completeTooltip += "			}			";
+	newFocus->completionReward += "			air_experience = 25\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					capital_scope = {\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							free_building_slots = {\n";
+	newFocus->completionReward += "								building = air_base\n";
+	newFocus->completionReward += "								size > 1\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				random_owned_controlled_state = {\n";
+	newFocus->completionReward += "					limit = {\n";
+	newFocus->completionReward += "						free_building_slots = {\n";
+	newFocus->completionReward += "							building = air_base\n";
+	newFocus->completionReward += "							size > 1\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					add_building_construction = {\n";
+	newFocus->completionReward += "						type = air_base\n";
+	newFocus->completionReward += "						level = 2\n";
+	newFocus->completionReward += "						instant_build = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					ROOT = { set_country_flag = aviation_effort_AB }\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					capital_scope = {\n";
+	newFocus->completionReward += "						free_building_slots = {\n";
+	newFocus->completionReward += "							building = air_base\n";
+	newFocus->completionReward += "							size > 1\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				capital_scope = {\n";
+	newFocus->completionReward += "					add_building_construction = {\n";
+	newFocus->completionReward += "						type = air_base\n";
+	newFocus->completionReward += "						level = 2\n";
+	newFocus->completionReward += "						instant_build = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					ROOT = { set_country_flag = aviation_effort_AB }\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = air_doc_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = air_doctrine\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "fighter_focus";
+	newFocus->icon = "GFX_goal_generic_air_fighter";
+	newFocus->prerequisites.push_back("focus = aviation_effort");
+	newFocus->mutuallyExclusive = "focus = bomber_focus";
+	newFocus->xPos = 4;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = fighter_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 2\n";
+	newFocus->completionReward += "				technology = early_fighter\n";
+	newFocus->completionReward += "				technology = fighter1\n";
+	newFocus->completionReward += "				technology = fighter2\n";
+	newFocus->completionReward += "				technology = fighter3\n";
+	newFocus->completionReward += "				technology = heavy_fighter1\n";
+	newFocus->completionReward += "				technology = heavy_fighter2\n";
+	newFocus->completionReward += "				technology = heavy_fighter3\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "bomber_focus";
+	newFocus->icon = "GFX_goal_generic_air_bomber";
+	newFocus->prerequisites.push_back("focus = aviation_effort");
+	newFocus->mutuallyExclusive = "focus = fighter_focus";
+	newFocus->xPos = 6;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = bomber_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 2\n";
+	newFocus->completionReward += "				technology = strategic_bomber1\n";
+	newFocus->completionReward += "				technology = strategic_bomber2\n";
+	newFocus->completionReward += "				technology = strategic_bomber3\n";
+	newFocus->completionReward += "				category = tactical_bomber\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "aviation_effort_2";
+	newFocus->icon = "GFX_goal_generic_air_doctrine";
+	newFocus->prerequisites.push_back("focus = bomber_focus focus = fighter_focus");
+	newFocus->xPos = 5;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completeTooltip += "			air_experience = 25\n";
+	newFocus->completeTooltip += "			if = { limit = { has_country_flag = aviation_effort_2_AB }\n";
+	newFocus->completeTooltip += "				add_building_construction = {\n";
+	newFocus->completeTooltip += "					type = air_base\n";
+	newFocus->completeTooltip += "					level = 2\n";
+	newFocus->completeTooltip += "					instant_build = yes\n";
+	newFocus->completeTooltip += "				}\n";
+	newFocus->completeTooltip += "			}\n";
+	newFocus->completeTooltip += "			add_tech_bonus = {\n";
+	newFocus->completeTooltip += "				name =  air_doc_bonus\n";
+	newFocus->completeTooltip += "				bonus = 0.5\n";
+	newFocus->completeTooltip += "				uses = 1\n";
+	newFocus->completeTooltip += "				category = air_doctrine\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			air_experience = 25\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					capital_scope = {\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "							NOT = { is_controlled_by = ROOT }\n";
+	newFocus->completionReward += "							NOT = {\n";
+	newFocus->completionReward += "								free_building_slots = {\n";
+	newFocus->completionReward += "									building = air_base\n";
+	newFocus->completionReward += "									size > 1\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				random_owned_controlled_state = {\n";
+	newFocus->completionReward += "					limit = {\n";
+	newFocus->completionReward += "						free_building_slots = {\n";
+	newFocus->completionReward += "							building = air_base\n";
+	newFocus->completionReward += "							size > 1\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					add_building_construction = {\n";
+	newFocus->completionReward += "						type = air_base\n";
+	newFocus->completionReward += "						level = 2\n";
+	newFocus->completionReward += "						instant_build = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					ROOT = { set_country_flag = aviation_effort_2_AB }\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					capital_scope = {\n";
+	newFocus->completionReward += "						is_controlled_by = ROOT\n";
+	newFocus->completionReward += "						free_building_slots = {\n";
+	newFocus->completionReward += "							building = air_base\n";
+	newFocus->completionReward += "							size > 1\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				capital_scope = {\n";
+	newFocus->completionReward += "					add_building_construction = {\n";
+	newFocus->completionReward += "						type = air_base\n";
+	newFocus->completionReward += "						level = 2\n";
+	newFocus->completionReward += "						instant_build = yes\n";
+	newFocus->completionReward += "					}				\n";
+	newFocus->completionReward += "					ROOT = { set_country_flag = aviation_effort_2_AB }\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name =  air_doc_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = air_doctrine\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "CAS_effort";
+	newFocus->icon = "GFX_goal_generic_CAS";
+	newFocus->prerequisites.push_back("focus = aviation_effort_2");
+	newFocus->prerequisites.push_back("focus = motorization_effort");
+	newFocus->xPos = 4;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = CAS_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				ahead_reduction = 1\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = cas_bomber\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "rocket_effort";
+	newFocus->icon = "GFX_focus_rocketry";
+	newFocus->prerequisites.push_back("focus = aviation_effort_2");
+	newFocus->prerequisites.push_back("focus = infrastructure_effort");
+	newFocus->xPos = 5;
+	newFocus->yPos = 4;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = jet_rocket_bonus\n";
+	newFocus->completionReward += "				ahead_reduction = 0.5\n";
+	newFocus->completionReward += "				uses = 2\n";
+	newFocus->completionReward += "				category = rocketry\n";
+	newFocus->completionReward += "				category = jet_technology\n";
+	newFocus->completionReward += "			}";
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0.25\n";
+	newFocus->aiWillDo += "				always = yes\n";
+	newFocus->aiWillDo += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "NAV_effort";
+	newFocus->icon = "GFX_goal_generic_air_naval_bomber";
+	newFocus->prerequisites.push_back("focus = aviation_effort_2");
+	newFocus->prerequisites.push_back("focus = flexible_navy");
+	newFocus->xPos = 6;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = nav_bomber_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				ahead_reduction = 1\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = naval_bomber\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "naval_effort";
+	newFocus->icon = "GFX_goal_generic_construct_naval_dockyard";
+	newFocus->xPos = 9;
+	newFocus->yPos = 0;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->available += "			any_state = {\n";
+	newFocus->available += "				is_coastal = yes\n";
+	newFocus->available += "				is_controlled_by = ROOT\n";
+	newFocus->available += "			}";
+	newFocus->completeTooltip += "			navy_experience = 25\n";
+	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 3\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = dockyard\n";
+	newFocus->completeTooltip += "				level = 3\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			navy_experience = 25\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					NOT = {\n";
+	newFocus->completionReward += "						any_owned_state = {\n";
+	newFocus->completionReward += "							dockyard > 0\n";
+	newFocus->completionReward += "							free_building_slots = {\n";
+	newFocus->completionReward += "								building = dockyard\n";
+	newFocus->completionReward += "								size > 2\n";
+	newFocus->completionReward += "								include_locked = yes\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					any_owned_state = {\n";
+	newFocus->completionReward += "						is_coastal = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				random_owned_controlled_state = {\n";
+	newFocus->completionReward += "					limit = {\n";
+	newFocus->completionReward += "						is_coastal = yes\n";
+	newFocus->completionReward += "						free_building_slots = {\n";
+	newFocus->completionReward += "							building = dockyard\n";
+	newFocus->completionReward += "							size > 2\n";
+	newFocus->completionReward += "							include_locked = yes\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					add_extra_state_shared_building_slots = 3\n";
+	newFocus->completionReward += "					add_building_construction = {\n";
+	newFocus->completionReward += "						type = dockyard\n";
+	newFocus->completionReward += "						level = 3\n";
+	newFocus->completionReward += "						instant_build = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				set_country_flag = naval_effort_built\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					NOT = { has_country_flag = naval_effort_built }\n";
+	newFocus->completionReward += "					any_owned_state = {\n";
+	newFocus->completionReward += "						dockyard > 0\n";
+	newFocus->completionReward += "						free_building_slots = {\n";
+	newFocus->completionReward += "							building = dockyard\n";
+	newFocus->completionReward += "							size > 2\n";
+	newFocus->completionReward += "							include_locked = yes\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				random_owned_controlled_state = {\n";
+	newFocus->completionReward += "					limit = {\n";
+	newFocus->completionReward += "						dockyard > 0\n";
+	newFocus->completionReward += "						free_building_slots = {\n";
+	newFocus->completionReward += "							building = dockyard\n";
+	newFocus->completionReward += "							size > 2\n";
+	newFocus->completionReward += "							include_locked = yes\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					add_extra_state_shared_building_slots = 3\n";
+	newFocus->completionReward += "					add_building_construction = {\n";
+	newFocus->completionReward += "						type = dockyard\n";
+	newFocus->completionReward += "						level = 3\n";
+	newFocus->completionReward += "						instant_build = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				set_country_flag = naval_effort_built\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					NOT = { has_country_flag = naval_effort_built }\n";
+	newFocus->completionReward += "					NOT = {\n";
+	newFocus->completionReward += "						any_owned_state = {\n";
+	newFocus->completionReward += "							free_building_slots = {\n";
+	newFocus->completionReward += "								building = dockyard\n";
+	newFocus->completionReward += "								size > 2\n";
+	newFocus->completionReward += "								include_locked = yes\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				random_state = {\n";
+	newFocus->completionReward += "					limit = {\n";
+	newFocus->completionReward += "						controller = { tag = ROOT }\n";
+	newFocus->completionReward += "						free_building_slots = {\n";
+	newFocus->completionReward += "							building = dockyard\n";
+	newFocus->completionReward += "							size > 2\n";
+	newFocus->completionReward += "							include_locked = yes\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					add_extra_state_shared_building_slots = 3\n";
+	newFocus->completionReward += "					add_building_construction = {\n";
+	newFocus->completionReward += "						type = dockyard\n";
+	newFocus->completionReward += "						level = 3\n";
+	newFocus->completionReward += "						instant_build = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "flexible_navy";
+	newFocus->icon = "GFX_goal_generic_build_navy";
+	newFocus->prerequisites.push_back("focus = naval_effort");
+	newFocus->mutuallyExclusive = "focus = large_navy";
+	newFocus->xPos = 8;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				all_owned_state = {\n";
+	newFocus->aiWillDo += "					OR = {\n";
+	newFocus->aiWillDo += "						is_coastal = no\n";
+	newFocus->aiWillDo += "						dockyard < 1\n";
+	newFocus->aiWillDo += "					}\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = sub_op_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 2\n";
+	newFocus->completionReward += "				technology = convoy_interdiction_ti\n";
+	newFocus->completionReward += "				technology = unrestricted_submarine_warfare\n";
+	newFocus->completionReward += "				technology = wolfpacks\n";
+	newFocus->completionReward += "				technology = advanced_submarine_warfare\n";
+	newFocus->completionReward += "				technology = combined_operations_raiding\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "large_navy";
+	newFocus->icon = "GFX_goal_generic_navy_doctrines_tactics";
+	newFocus->prerequisites.push_back("focus = naval_effort");
+	newFocus->mutuallyExclusive = "focus = flexible_navy";
+	newFocus->xPos = 10;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				all_owned_state = {\n";
+	newFocus->aiWillDo += "					OR = {\n";
+	newFocus->aiWillDo += "						is_coastal = no\n";
+	newFocus->aiWillDo += "						dockyard < 1\n";
+	newFocus->aiWillDo += "					}\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = fleet_in_being_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 2\n";
+	newFocus->completionReward += "				category = fleet_in_being_tree\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "submarine_effort";
+	newFocus->icon = "GFX_goal_generic_navy_submarine";
+	newFocus->prerequisites.push_back("focus = flexible_navy focus = large_navy");
+	newFocus->xPos = 8;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				all_owned_state = {\n";
+	newFocus->aiWillDo += "					OR = {\n";
+	newFocus->aiWillDo += "						is_coastal = no\n";
+	newFocus->aiWillDo += "						dockyard < 1\n";
+	newFocus->aiWillDo += "					}\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = ss_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				ahead_reduction = 1\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				technology = early_submarine\n";
+	newFocus->completionReward += "				technology = basic_submarine\n";
+	newFocus->completionReward += "				technology = improved_submarine\n";
+	newFocus->completionReward += "				technology = advanced_submarine\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "cruiser_effort";
+	newFocus->icon = "GFX_goal_generic_navy_cruiser";
+	newFocus->prerequisites.push_back("focus = large_navy focus = flexible_navy");
+	newFocus->xPos = 10;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				all_owned_state = {\n";
+	newFocus->aiWillDo += "					OR = {\n";
+	newFocus->aiWillDo += "						is_coastal = no\n";
+	newFocus->aiWillDo += "						dockyard < 1\n";
+	newFocus->aiWillDo += "					}\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = cr_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				ahead_reduction = 1\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				technology = improved_light_cruiser\n";
+	newFocus->completionReward += "				technology = advanced_light_cruiser\n";
+	newFocus->completionReward += "				technology = improved_heavy_cruiser\n";
+	newFocus->completionReward += "				technology = advanced_heavy_cruiser\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "destroyer_effort";
+	newFocus->icon = "GFX_goal_generic_wolf_pack";
+	newFocus->prerequisites.push_back("focus = submarine_effort");
+	newFocus->xPos = 8;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				all_owned_state = {\n";
+	newFocus->aiWillDo += "					OR = {\n";
+	newFocus->aiWillDo += "						is_coastal = no\n";
+	newFocus->aiWillDo += "						dockyard < 1\n";
+	newFocus->aiWillDo += "					}\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = dd_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				ahead_reduction = 1\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				technology = early_destroyer\n";
+	newFocus->completionReward += "				technology = basic_destroyer\n";
+	newFocus->completionReward += "				technology = improved_destroyer\n";
+	newFocus->completionReward += "				technology = advanced_destroyer\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "capital_ships_effort";
+	newFocus->icon = "GFX_goal_generic_navy_battleship";
+	newFocus->prerequisites.push_back("focus = cruiser_effort");
+	newFocus->xPos = 10;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				all_owned_state = {\n";
+	newFocus->aiWillDo += "					OR = {\n";
+	newFocus->aiWillDo += "						is_coastal = no\n";
+	newFocus->aiWillDo += "						dockyard < 1\n";
+	newFocus->aiWillDo += "					}\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			navy_experience = 25\n";
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = capital_ships_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				ahead_reduction = 1\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				technology = basic_battlecruiser\n";
+	newFocus->completionReward += "				technology = basic_battleship\n";
+	newFocus->completionReward += "				technology = improved_battleship\n";
+	newFocus->completionReward += "				technology = advanced_battleship\n";
+	newFocus->completionReward += "				technology = heavy_battleship\n";
+	newFocus->completionReward += "				technology = heavy_battleship2\n";
+	newFocus->completionReward += "				technology = early_carrier\n";
+	newFocus->completionReward += "				technology = basic_carrier\n";
+	newFocus->completionReward += "				technology = improved_carrier\n";
+	newFocus->completionReward += "				technology = advanced_carrier\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "industrial_effort";
+	newFocus->icon = "GFX_goal_generic_production";
+	newFocus->xPos = 13;
+	newFocus->yPos = 0;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = industrial_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 1\n";
+	newFocus->completionReward += "				category = industry\n";
+	newFocus->completionReward += "			}";
+	newFocus->aiWillDo += "			factor = 3\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				date < 1939.1.1\n";
+	newFocus->aiWillDo += "				OR = {\n";
+	newFocus->aiWillDo += "					# we also dont want tiny nations to go crazy with slots right away\n";
+	newFocus->aiWillDo += "					num_of_controlled_states < 2\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "construction_effort";
+	newFocus->icon = "GFX_goal_generic_construct_civ_factory";
+	newFocus->prerequisites.push_back("focus = industrial_effort");
+	newFocus->xPos = 12;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 2";
+	newFocus->bypass += "			custom_trigger_tooltip = {\n";
+	newFocus->bypass += "				tooltip = construction_effort_tt\n";
+	newFocus->bypass += "				all_owned_state = {\n";
+	newFocus->bypass += "					free_building_slots = {\n";
+	newFocus->bypass += "						building = industrial_complex\n";
+	newFocus->bypass += "						size < 1\n";
+	newFocus->bypass += "						include_locked = yes\n";
+	newFocus->bypass += "					}					\n";
+	newFocus->bypass += "				}\n";
+	newFocus->bypass += "			}";
+	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = industrial_complex\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			random_owned_controlled_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = industrial_complex\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = industrial_complex\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = industrial_complex\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "production_effort";
+	newFocus->icon = "GFX_goal_generic_construct_mil_factory";
+	newFocus->prerequisites.push_back("focus = industrial_effort");
+	newFocus->xPos = 14;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 2";
+	newFocus->bypass += "			custom_trigger_tooltip = {\n";
+	newFocus->bypass += "				tooltip = production_effort_tt\n";
+	newFocus->bypass += "				all_owned_state = {\n";
+	newFocus->bypass += "					free_building_slots = {\n";
+	newFocus->bypass += "						building = arms_factory\n";
+	newFocus->bypass += "						size < 1\n";
+	newFocus->bypass += "						include_locked = yes\n";
+	newFocus->bypass += "					}\n";
+	newFocus->bypass += "				}\n";
+	newFocus->bypass += "			}";
+	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = arms_factory\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			random_owned_controlled_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = arms_factory\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = arms_factory\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = arms_factory\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "construction_effort_2";
+	newFocus->icon = "GFX_goal_generic_construct_civ_factory";
+	newFocus->prerequisites.push_back("focus = construction_effort");
+	newFocus->xPos = 12;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 2";
+	newFocus->bypass += "			custom_trigger_tooltip = {\n";
+	newFocus->bypass += "				tooltip = construction_effort_tt\n";
+	newFocus->bypass += "				all_owned_state = {\n";
+	newFocus->bypass += "					free_building_slots = {\n";
+	newFocus->bypass += "						building = industrial_complex\n";
+	newFocus->bypass += "						size < 1\n";
+	newFocus->bypass += "						include_locked = yes\n";
+	newFocus->bypass += "					}\n";
+	newFocus->bypass += "				}\n";
+	newFocus->bypass += "			}";
+	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = industrial_complex\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			random_owned_controlled_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = industrial_complex\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = industrial_complex\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = industrial_complex\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "production_effort_2";
+	newFocus->icon = "GFX_goal_generic_construct_mil_factory";
+	newFocus->prerequisites.push_back("focus = production_effort");
+	newFocus->xPos = 14;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 2";
+	newFocus->bypass += "			custom_trigger_tooltip = {\n";
+	newFocus->bypass += "				tooltip = production_effort_tt\n";
+	newFocus->bypass += "				all_owned_state = {\n";
+	newFocus->bypass += "					free_building_slots = {\n";
+	newFocus->bypass += "						building = arms_factory\n";
+	newFocus->bypass += "						size < 1\n";
+	newFocus->bypass += "						include_locked = yes\n";
+	newFocus->bypass += "					}\n";
+	newFocus->bypass += "				}\n";
+	newFocus->bypass += "			}";
+	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = arms_factory\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			random_owned_controlled_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = arms_factory\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = arms_factory\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = arms_factory\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "infrastructure_effort";
+	newFocus->icon = "GFX_goal_generic_construct_infrastructure";
+	newFocus->prerequisites.push_back("focus = construction_effort_2");
+	newFocus->xPos = 12;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->bypass += "			custom_trigger_tooltip = {\n";
+	newFocus->bypass += "				tooltip = infrastructure_effort_tt\n";
+	newFocus->bypass += "				all_owned_state = {			\n";
+	newFocus->bypass += "					free_building_slots = {\n";
+	newFocus->bypass += "						building = infrastructure\n";
+	newFocus->bypass += "						size < 1\n";
+	newFocus->bypass += "					}\n";
+	newFocus->bypass += "				}\n";
+	newFocus->bypass += "			}";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = infrastructure\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = infrastructure\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			random_owned_controlled_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = infrastructure\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = infrastructure\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = infrastructure\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			random_owned_controlled_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = infrastructure\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = infrastructure\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = infrastructure\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "production_effort_3";
+	newFocus->icon = "GFX_goal_generic_construct_mil_factory";
+	newFocus->prerequisites.push_back("focus = production_effort_2");
+	newFocus->xPos = 14;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 2";
+	newFocus->bypass += "			custom_trigger_tooltip = {\n";
+	newFocus->bypass += "				tooltip = production_effort_tt\n";
+	newFocus->bypass += "				all_owned_state = {\n";
+	newFocus->bypass += "					free_building_slots = {\n";
+	newFocus->bypass += "						building = arms_factory\n";
+	newFocus->bypass += "						size < 1\n";
+	newFocus->bypass += "						include_locked = yes\n";
+	newFocus->bypass += "					}\n";
+	newFocus->bypass += "				}\n";
+	newFocus->bypass += "			}";
+	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 1\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = arms_factory\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			random_owned_controlled_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = arms_factory\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = arms_factory\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = arms_factory\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "infrastructure_effort_2";
+	newFocus->icon = "GFX_goal_generic_construct_infrastructure";
+	newFocus->prerequisites.push_back("focus = infrastructure_effort");
+	newFocus->xPos = 12;
+	newFocus->yPos = 4;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->bypass += "			custom_trigger_tooltip = {\n";
+	newFocus->bypass += "				tooltip = infrastructure_effort_tt\n";
+	newFocus->bypass += "				all_owned_state = {			\n";
+	newFocus->bypass += "					free_building_slots = {\n";
+	newFocus->bypass += "						building = infrastructure\n";
+	newFocus->bypass += "						size < 1\n";
+	newFocus->bypass += "					}\n";
+	newFocus->bypass += "				}\n";
+	newFocus->bypass += "			}";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = infrastructure\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = infrastructure\n";
+	newFocus->completeTooltip += "				level = 1\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			random_owned_controlled_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = infrastructure\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = infrastructure\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = infrastructure\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			random_owned_controlled_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = infrastructure\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = infrastructure\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = infrastructure\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "construction_effort_3";
+	newFocus->icon = "GFX_goal_generic_construct_civ_factory";
+	newFocus->prerequisites.push_back("focus = infrastructure_effort");
+	newFocus->xPos = 14;
+	newFocus->yPos = 4;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 2";
+	newFocus->bypass += "			custom_trigger_tooltip = {\n";
+	newFocus->bypass += "				tooltip = construction_effort_tt\n";
+	newFocus->bypass += "				all_owned_state = {\n";
+	newFocus->bypass += "					free_building_slots = {\n";
+	newFocus->bypass += "						building = industrial_complex\n";
+	newFocus->bypass += "						size < 2\n";
+	newFocus->bypass += "						include_locked = yes\n";
+	newFocus->bypass += "					}\n";
+	newFocus->bypass += "				}\n";
+	newFocus->bypass += "			}";
+	newFocus->completeTooltip += "			add_extra_state_shared_building_slots = 2\n";
+	newFocus->completeTooltip += "			add_building_construction = {\n";
+	newFocus->completeTooltip += "				type = industrial_complex\n";
+	newFocus->completeTooltip += "				level = 2\n";
+	newFocus->completeTooltip += "				instant_build = yes\n";
+	newFocus->completeTooltip += "			}";
+	newFocus->completionReward += "			random_owned_controlled_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = industrial_complex\n";
+	newFocus->completionReward += "						size > 1\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = industrial_complex\n";
+	newFocus->completionReward += "										size > 1\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 2\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = industrial_complex\n";
+	newFocus->completionReward += "					level = 2\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "nuclear_effort";
+	newFocus->icon = "GFX_focus_wonderweapons";
+	newFocus->prerequisites.push_back("focus = infrastructure_effort_2");
+	newFocus->xPos = 10;
+	newFocus->yPos = 5;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = nuclear_bonus\n";
+	newFocus->completionReward += "				ahead_reduction = 0.5\n";
+	newFocus->completionReward += "				category = nuclear\n";
+	newFocus->completionReward += "			}";
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0.25\n";
+	newFocus->aiWillDo += "				always = yes\n";
+	newFocus->aiWillDo += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "extra_tech_slot";
+	newFocus->icon = "GFX_focus_research";
+	newFocus->prerequisites.push_back("focus = infrastructure_effort_2");
+	newFocus->xPos = 12;
+	newFocus->yPos = 5;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_research_slot = 1";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "extra_tech_slot_2";
+	newFocus->icon = "GFX_focus_research";
+	newFocus->prerequisites.push_back("focus = extra_tech_slot");
+	newFocus->available += "			num_of_factories > 50";
+	newFocus->cancelIfInvalid += "no";
+	newFocus->continueIfInvalid += "yes";
+	newFocus->xPos = 12;
+	newFocus->yPos = 6;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_research_slot = 1";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "secret_weapons";
+	newFocus->icon = "GFX_goal_generic_secret_weapon";
+	newFocus->prerequisites.push_back("focus = infrastructure_effort_2");
+	newFocus->xPos = 14;
+	newFocus->yPos = 5;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_tech_bonus = {\n";
+	newFocus->completionReward += "				name = secret_bonus\n";
+	newFocus->completionReward += "				bonus = 0.5\n";
+	newFocus->completionReward += "				uses = 4\n";
+	newFocus->completionReward += "				category = electronics\n";
+	newFocus->completionReward += "				category = nuclear\n";
+	newFocus->completionReward += "				category = rocketry\n";
+	newFocus->completionReward += "			}";
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0.25\n";
+	newFocus->aiWillDo += "				always = yes\n";
+	newFocus->aiWillDo += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "political_effort";
+	newFocus->icon = "GFX_goal_generic_demand_territory";
+	newFocus->xPos = 19;
+	newFocus->yPos = 0;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_political_power = 120";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "collectivist_ethos";
+	newFocus->icon = "GFX_goal_generic_national_unity #icon = GFX_goal_tripartite_pact";
+	newFocus->prerequisites.push_back("focus = political_effort");
+	newFocus->mutuallyExclusive = "focus = liberty_ethos";
+	newFocus->available += "			OR = {\n";
+	newFocus->available += "				has_government = fascism\n";
+	newFocus->available += "				has_government = communism\n";
+	newFocus->available += "				has_government = neutrality\n";
+	newFocus->available += "			}";
+	newFocus->xPos = 18;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 5\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				OR = {\n";
+	newFocus->aiWillDo += "					is_historical_focus_on = yes\n";
+	newFocus->aiWillDo += "					has_idea = neutrality_idea\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_ideas = collectivist_ethos_focus";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "nationalism_focus";
+	newFocus->icon = "GFX_goal_support_fascism #icon = GFX_goal_tripartite_pact";
+	newFocus->prerequisites.push_back("focus = collectivist_ethos");
+	newFocus->mutuallyExclusive = "focus = internationalism_focus";
+	newFocus->available += "			OR = {\n";
+	newFocus->available += "				has_government = fascism\n";
+	newFocus->available += "				has_government = neutrality\n";
+	newFocus->available += "			}";
+	newFocus->xPos = 16;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 5\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 2\n";
+	newFocus->aiWillDo += "				any_neighbor_country = {\n";
+	newFocus->aiWillDo += "					is_major = yes\n";
+	newFocus->aiWillDo += "					has_government = fascism\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_ideas = nationalism";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "internationalism_focus";
+	newFocus->icon = "GFX_goal_support_communism #icon = GFX_goal_tripartite_pact";
+	newFocus->prerequisites.push_back("focus = collectivist_ethos");
+	newFocus->mutuallyExclusive = "focus = nationalism_focus";
+	newFocus->available += "			OR = {\n";
+	newFocus->available += "				has_government = communism\n";
+	newFocus->available += "				has_government = neutrality\n";
+	newFocus->available += "			}";
+	newFocus->xPos = 18;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 5\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 2\n";
+	newFocus->aiWillDo += "				any_neighbor_country = {\n";
+	newFocus->aiWillDo += "					is_major = yes\n";
+	newFocus->aiWillDo += "					has_government = communism\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_ideas = internationalism";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "liberty_ethos";
+	newFocus->icon = "GFX_goal_support_democracy";
+	newFocus->prerequisites.push_back("focus = political_effort");
+	newFocus->mutuallyExclusive = "focus = collectivist_ethos";
+	newFocus->available += "			OR = {\n";
+	newFocus->available += "				has_government = democratic\n";
+	newFocus->available += "				has_government = neutrality\n";
+	newFocus->available += "			}";
+	newFocus->xPos = 20;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 95\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0.1\n";
+	newFocus->aiWillDo += "				any_neighbor_country = {\n";
+	newFocus->aiWillDo += "					is_major = yes\n";
+	newFocus->aiWillDo += "					OR = {\n";
+	newFocus->aiWillDo += "						has_government = communism\n";
+	newFocus->aiWillDo += "						has_government = fascism\n";
+	newFocus->aiWillDo += "					}\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "				NOT = {\n";
+	newFocus->aiWillDo += "					any_neighbor_country = {\n";
+	newFocus->aiWillDo += "						is_major = yes\n";
+	newFocus->aiWillDo += "						has_government = democratic\n";
+	newFocus->aiWillDo += "					}\n";
+	newFocus->aiWillDo += "				}\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_ideas = liberty_ethos_focus";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "militarism";
+	newFocus->icon = "GFX_goal_generic_political_pressure";
+	newFocus->prerequisites.push_back("focus = nationalism_focus");
+	newFocus->xPos = 16;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { has_idea = neutrality_idea }\n";
+	newFocus->completionReward += "				remove_ideas = neutrality_idea\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			add_ideas = militarism_focus\n";
+	newFocus->completionReward += "			army_experience = 20\n";
+	newFocus->completionReward += "			set_rule = { can_send_volunteers = yes }";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "political_correctness";
+	newFocus->icon = "GFX_goal_generic_dangerous_deal";
+	newFocus->prerequisites.push_back("focus = internationalism_focus");
+	newFocus->xPos = 18;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { has_idea = neutrality_idea }\n";
+	newFocus->completionReward += "				remove_ideas = neutrality_idea\n";
+	newFocus->completionReward += "			}		\n";
+	newFocus->completionReward += "			add_political_power = 200\n";
+	newFocus->completionReward += "			add_ideas = idea_political_correctness";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "neutrality_focus";
+	newFocus->icon = "GFX_goal_generic_neutrality_focus";
+	newFocus->prerequisites.push_back("focus = liberty_ethos");
+	newFocus->mutuallyExclusive = "focus = interventionism_focus";
+	newFocus->xPos = 20;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { NOT = { has_idea = neutrality_idea } }\n";
+	newFocus->completionReward += "				add_ideas = neutrality_idea\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			add_political_power = 150";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "interventionism_focus";
+	newFocus->icon = "GFX_goal_generic_political_pressure";
+	newFocus->prerequisites.push_back("focus = liberty_ethos");
+	newFocus->mutuallyExclusive = "focus = neutrality_focus";
+	newFocus->xPos = 22;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->aiWillDo += "			factor = 1\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				has_idea = neutrality_idea\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { has_idea = neutrality_idea }\n";
+	newFocus->completionReward += "				remove_ideas = neutrality_idea\n";
+	newFocus->completionReward += "			}	\n";
+	newFocus->completionReward += "			set_rule = { can_send_volunteers = yes }\n";
+	newFocus->completionReward += "			add_political_power = 150";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "military_youth";
+	newFocus->icon = "GFX_goal_generic_more_territorial_claims";
+	newFocus->prerequisites.push_back("focus = militarism");
+	newFocus->xPos = 16;
+	newFocus->yPos = 4;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_ideas = military_youth_focus\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { has_government = fascism }\n";
+	newFocus->completionReward += "				add_popularity = {\n";
+	newFocus->completionReward += "					ideology = fascism\n";
+	newFocus->completionReward += "					popularity = 0.2\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { has_government = communism }\n";
+	newFocus->completionReward += "				add_popularity = {\n";
+	newFocus->completionReward += "					ideology = communism\n";
+	newFocus->completionReward += "					popularity = 0.2\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "deterrence";
+	newFocus->icon = "GFX_goal_generic_defence";
+	newFocus->prerequisites.push_back("focus = neutrality_focus");
+	newFocus->xPos = 20;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_ideas = deterrence";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "volunteer_corps";
+	newFocus->icon = "GFX_goal_generic_allies_build_infantry";
+	newFocus->prerequisites.push_back("focus = interventionism_focus");
+	newFocus->xPos = 22;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_ideas = volunteer_corps_focus";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "paramilitarism";
+	newFocus->icon = "GFX_goal_generic_military_sphere";
+	newFocus->prerequisites.push_back("focus = military_youth");
+	newFocus->xPos = 16;
+	newFocus->yPos = 5;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_ideas = paramilitarism_focus";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "indoctrination_focus";
+	newFocus->icon = "GFX_goal_generic_propaganda";
+	newFocus->prerequisites.push_back("focus = political_correctness");
+	newFocus->xPos = 18;
+	newFocus->yPos = 4;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_ideas = indoctrination_focus\n";
+	newFocus->completionReward += "			add_political_power = 150";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "foreign_expeditions";
+	newFocus->icon = "GFX_goal_generic_more_territorial_claims";
+	newFocus->prerequisites.push_back("focus = volunteer_corps");
+	newFocus->xPos = 22;
+	newFocus->yPos = 4;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_ideas = foreign_expeditions_focus";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "why_we_fight";
+	newFocus->icon = "GFX_goal_generic_propaganda";
+	newFocus->prerequisites.push_back("focus = foreign_expeditions focus = deterrence");
+	newFocus->available += "			OR = {\n";
+	newFocus->available += "				threat > 0.75\n";
+	newFocus->available += "				has_defensive_war = yes\n";
+	newFocus->available += "			}";
+	newFocus->continueIfInvalid += "yes";
+	newFocus->xPos = 20;
+	newFocus->yPos = 5;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { NOT = { has_idea = neutrality_idea } }\n";
+	newFocus->completionReward += "				set_rule = { can_create_factions = yes }\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			add_ideas = why_we_fight_focus";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "political_commissars";
+	newFocus->icon = "GFX_goal_generic_forceful_treaty";
+	newFocus->prerequisites.push_back("focus = indoctrination_focus");
+	newFocus->available = " ";
+	newFocus->xPos = 18;
+	newFocus->yPos = 5;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_ideas = political_commissars_focus\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { has_government = fascism }\n";
+	newFocus->completionReward += "				add_popularity = {\n";
+	newFocus->completionReward += "					ideology = fascism\n";
+	newFocus->completionReward += "					popularity = 0.2\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = { has_government = communism }\n";
+	newFocus->completionReward += "				add_popularity = {\n";
+	newFocus->completionReward += "					ideology = communism\n";
+	newFocus->completionReward += "					popularity = 0.2\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			add_political_power = 200";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "ideological_fanaticism";
+	newFocus->icon = "GFX_goal_generic_demand_territory";
+	newFocus->prerequisites.push_back("focus = paramilitarism");
+	newFocus->prerequisites.push_back("focus = political_commissars");
+	newFocus->xPos = 17;
+	newFocus->yPos = 6;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			add_ideas = ideological_fanaticism_focus\n";
+	newFocus->completionReward += "			set_rule = {\n";
+	newFocus->completionReward += "				can_create_factions = yes\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			hidden_effect = {\n";
+	newFocus->completionReward += "				set_rule = { can_use_kamikaze_pilots = yes }\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			custom_effect_tooltip = kamikaze_focus_tooltip";
+	focuses.push_back(newFocus);
+
+	newFocus = new HoI4Focus;
+	newFocus->id = "technology_sharing";
+	newFocus->icon = "GFX_goal_generic_scientific_exchange";
+	newFocus->prerequisites.push_back("focus = ideological_fanaticism");
+	newFocus->prerequisites.push_back("focus = why_we_fight");
+	newFocus->available += "			has_war = yes\n";
+	newFocus->available += "			is_in_faction = yes\n";
+	newFocus->available += "			OR = {\n";
+	newFocus->available += "				num_of_factories > 50\n";
+	newFocus->available += "				any_other_country = {\n";
+	newFocus->available += "					is_in_faction_with = ROOT\n";
+	newFocus->available += "					num_of_factories > 50\n";
+	newFocus->available += "				}\n";
+	newFocus->available += "			}";
+	newFocus->xPos = 19;
+	newFocus->yPos = 7;
+	newFocus->cost = 10;
+	newFocus->availableIfCapitulated = true;
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					original_research_slots < 3\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_research_slot = 1\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			if = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					original_research_slots > 2\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_tech_bonus = {\n";
+	newFocus->completionReward += "					name = electronics_bonus\n";
+	newFocus->completionReward += "					bonus = 0.5\n";
+	newFocus->completionReward += "					uses = 1\n";
+	newFocus->completionReward += "					category = electronics\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_tech_bonus = {\n";
+	newFocus->completionReward += "					name = industrial_bonus\n";
+	newFocus->completionReward += "					bonus = 0.5\n";
+	newFocus->completionReward += "					uses = 1\n";
+	newFocus->completionReward += "					category = industry\n";
+	newFocus->completionReward += "				}	\n";
+	newFocus->completionReward += "				add_tech_bonus = {\n";
+	newFocus->completionReward += "					name = infantry_weapons_bonus\n";
+	newFocus->completionReward += "					bonus = 0.5\n";
+	newFocus->completionReward += "					uses = 1\n";
+	newFocus->completionReward += "					category = infantry_weapons\n";
+	newFocus->completionReward += "					category = artillery\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+}
+
+HoI4FocusTree* HoI4FocusTree::makeCustomizedCopy(const HoI4Country* country) const
+{
+	HoI4FocusTree* newFocusTree = new HoI4FocusTree(country);
+
+	for (auto focus: focuses)
+	{
+		HoI4Focus* newFocus = focus->makeCustomizedCopy(newFocusTree->dstCountryTag);
+		newFocusTree->addFocus(newFocus);
+	}
+
+	return newFocusTree;
+}
+
+
+void HoI4FocusTree::addDemocracyNationalFocuses(HoI4Country* Home, vector<HoI4Country*> CountriesToContain, int XStart)
+{
+	double WTModifier = 1;
+	if (Home->getGovernment() == "democratic")
+	{
+		string warPol = Home->getRulingParty().war_pol;
+		if (warPol == "jingoism")
+			WTModifier = 0;
+		if (warPol == "pro_military")
+			WTModifier = 0.25;
+		if (warPol == "anti_military")
+			WTModifier = 0.5;
+	}
+	if (Home->getGovernment() == "hms_government")
+	{
+		string warPol = Home->getRulingParty().war_pol;
+		if (warPol == "jingoism")
+			WTModifier = 0;
+		if (warPol == "pro_military")
+			WTModifier = 0;
+		if (warPol == "anti_military")
+			WTModifier = 0.25;
+		if (warPol == "pacifism" || warPol == "pacifist")
+			WTModifier = 0.5;
+	}
+
+	//War Propoganda
+	HoI4Focus* newFocus = new HoI4Focus;
+	newFocus->id = "WarProp" + Home->getTag();
+	newFocus->icon = "GFX_goal_generic_propaganda";
+	newFocus->text += "War Propoganda";
+	newFocus->available += "			threat > " + to_string(0.2*WTModifier);
+	newFocus->xPos = XStart;
+	newFocus->yPos = 0;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 10";
+	newFocus->completionReward += "			add_ideas = militarism_focus";
+	focuses.push_back(newFocus);
+
+	//Prepare Intervention
+	newFocus = new HoI4Focus;
+	newFocus->id = "PrepInter" + Home->getTag();
+	newFocus->icon = "GFX_goal_generic_occupy_states_ongoing_war";
+	newFocus->text += "War Propoganda";
+	newFocus->prerequisites.push_back("focus = WarProp" + Home->getTag());
+	newFocus->available += "			threat > " + to_string(0.4 * WTModifier);
+	newFocus->xPos = XStart;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 10";
+	newFocus->completionReward += "			set_rule = { can_send_volunteers = yes }";
+	focuses.push_back(newFocus);
+
+	int offBalance = 0;
+	if (CountriesToContain.size() >= 2)
+		offBalance = -3;
+	if (CountriesToContain.size() == 1)
+		offBalance = -2;
+
+	//Limited Intervention
+	newFocus = new HoI4Focus;
+	newFocus->id = "Lim" + Home->getTag();
+	newFocus->icon = "GFX_goal_generic_more_territorial_claims";
+	newFocus->text += "Limited Intervention";
+	newFocus->prerequisites.push_back("focus = PrepInter" + Home->getTag());
+	newFocus->available += "			threat > " + to_string(0.8 * WTModifier);
+	newFocus->xPos = XStart + offBalance;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 10";
+	newFocus->completionReward += "			add_ideas = limited_interventionism\n";
+	newFocus->completionReward += "			set_rule = { can_send_volunteers = yes }";
+	focuses.push_back(newFocus);
+
+	int warPlannumber = 1;
+	//for (auto Country : CountriesToContain)
+
+	for (int i = CountriesToContain.size() - 1; i >= 0; i--)
+	{
+		HoI4Country* Country = CountriesToContain[i];
+		//War Plan
+		newFocus = new HoI4Focus;
+		newFocus->id = "WarPlan" + Home->getTag() + Country->getTag();
+		newFocus->icon = "GFX_goal_generic_position_armies";
+		newFocus->text += "War Plan " + Country->getSourceCountry()->getName("english");
+		newFocus->prerequisites.push_back("focus = PrepInter" + Home->getTag());
+		newFocus->available += "			" + Country->getTag() + " = { is_in_faction_with = " + Home->getTag() + " }\n";
+		newFocus->available += "			" + Country->getTag() + " = { has_added_tension_amount > 30 }";
+		newFocus->xPos = XStart + offBalance + warPlannumber * 2;
+		newFocus->yPos = 2;
+		newFocus->cost = 10;
+		newFocus->aiWillDo += "			factor = 10";
+		newFocus->completionReward += "			army_experience = 20\n";
+		newFocus->completionReward += "			add_tech_bonus = {\n";
+		newFocus->completionReward += "				name = land_doc_bonus\n";
+		newFocus->completionReward += "				bonus = 0.5\n";
+		newFocus->completionReward += "				uses = 1\n";
+		newFocus->completionReward += "				category = land_doctrine\n";
+		newFocus->completionReward += "			}";
+		focuses.push_back(newFocus);
+
+		//Embargo
+		newFocus = new HoI4Focus;
+		newFocus->id = "Embargo" + Home->getTag() + Country->getTag();
+		newFocus->icon = "GFX_goal_generic_trade";
+		newFocus->text += "Embargo " + Country->getSourceCountry()->getName("english");
+		newFocus->prerequisites.push_back("focus =  WarPlan" + Home->getTag() + Country->getTag());
+		newFocus->available += "			" + Country->getTag() + " = { is_in_faction_with = " + Home->getTag() + " }\n";
+		newFocus->available += "			" + Country->getTag() + " = { has_added_tension_amount > 30 }";
+		newFocus->xPos = XStart + offBalance + warPlannumber * 2;
+		newFocus->yPos = 3;
+		newFocus->cost = 10;
+		newFocus->aiWillDo += "			factor = 10";
+		newFocus->completionReward += "			" + Country->getTag() + " = {\n";
+		newFocus->completionReward += "				add_opinion_modifier = { target = " + Home->getTag() + " modifier = embargo }\n";
+		newFocus->completionReward += "			}";
+		focuses.push_back(newFocus);
+
+		//WAR
+		newFocus = new HoI4Focus;
+		newFocus->id = "WAR" + Home->getTag() + Country->getTag();
+		newFocus->icon = "GFX_goal_support_democracy";
+		newFocus->text += "Enact War Plan " + Country->getSourceCountry()->getName("english");
+		newFocus->available += "			" + Country->getTag() + " = { is_in_faction_with = " + Home->getTag() + " }";
+		newFocus->prerequisites.push_back("focus =  Embargo" + Home->getTag() + Country->getTag());
+		newFocus->prerequisites.push_back("focus =  Lim" + Home->getTag());
+		newFocus->xPos = XStart + offBalance + warPlannumber++ * 2;
+		newFocus->yPos = 4;
+		newFocus->cost = 10;
+		newFocus->aiWillDo += "			factor = 10";
+		newFocus->completionReward += "			create_wargoal = {\n";
+		newFocus->completionReward += "				type = puppet_wargoal_focus\n";
+		newFocus->completionReward += "				target = " + Country->getTag() + "\n";
+		newFocus->completionReward += "			}";
+		focuses.push_back(newFocus);
+	}
+}
+
+
+void HoI4FocusTree::addMonarchyEmpireNationalFocuses(HoI4Country* Home, const vector<HoI4Country*>& targetColonies, const vector<HoI4Country*>& annexationTargets)
+{
+	//Glory to Empire!
+	HoI4Focus* newFocus = new HoI4Focus;
+	newFocus->id = "EmpireGlory" + Home->getTag();
+	newFocus->icon = "GFX_goal_anschluss";
+	newFocus->text += "Glory to the Empire!";
+	//newFocus->available += "			is_puppet = no\n";
+	newFocus->xPos =  29;
+	newFocus->yPos = 0;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 10\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "				factor = 0\n";
+	newFocus->aiWillDo += "				date < 1937.6.6\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_national_unity = 0.1";
+	focuses.push_back(newFocus);
+
+	//Colonies Focus
+	newFocus = new HoI4Focus;
+	newFocus->id = "StrengthenColonies" + Home->getTag();
+	newFocus->icon = "GFX_goal_generic_position_armies";
+	newFocus->text += "Strengthen the Colonies";
+	newFocus->prerequisites.push_back("focus = EmpireGlory" + Home->getTag());
+	newFocus->mutuallyExclusive = "focus = StrengthenHome" + Home->getTag();
+	newFocus->xPos =  28;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 0\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			navy_experience = 25";
+	focuses.push_back(newFocus);
+
+	//Home Focus
+	newFocus = new HoI4Focus;
+	newFocus->id = "StrengthenHome" + Home->getTag();
+	newFocus->icon = "GFX_goal_generic_national_unity";
+	newFocus->text += "Strengthen Home";
+	newFocus->prerequisites.push_back("focus = EmpireGlory" + Home->getTag());
+	newFocus->mutuallyExclusive = "focus = StrengthenColonies" + Home->getTag();
+	newFocus->xPos =  30;
+	newFocus->yPos = 1;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 10\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			army_experience = 25";
+	focuses.push_back(newFocus);
+
+	//Colonial Factories
+	newFocus = new HoI4Focus;
+	newFocus->id = "ColonialInd" + Home->getTag();
+	newFocus->icon = "GFX_goal_generic_construct_civ_factory";
+	newFocus->text += "Colonial Industry Buildup";
+	newFocus->prerequisites.push_back("focus = StrengthenColonies" + Home->getTag());
+	newFocus->xPos =  26;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 10\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = arms_factory\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = no\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = industrial_complex\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = no\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = arms_factory\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = arms_factory\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = no\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = industrial_complex\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = no\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = arms_factory\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = arms_factory\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = no\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = industrial_complex\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = no\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = arms_factory\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	//Colonial Highway
+	newFocus = new HoI4Focus;
+	newFocus->id = "ColonialHwy" + Home->getTag();
+	newFocus->icon = "GFX_goal_generic_construct_infrastructure";
+	newFocus->text += "Colonial Highway";
+	newFocus->prerequisites.push_back("focus = ColonialInd" + Home->getTag());
+	newFocus->xPos =  24;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 10\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = infrastructure\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = no\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = infrastructure\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = no\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = infrastructure\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = infrastructure\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = no\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = infrastructure\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = no\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = infrastructure\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = infrastructure\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = no\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = infrastructure\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = no\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = infrastructure\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	//improve resources
+	newFocus = new HoI4Focus;
+	newFocus->id = "ResourceFac" + Home->getTag();
+	newFocus->icon = "GFX_goal_generic_oil_refinery";
+	newFocus->text += "Improve Resource Factories";
+	newFocus->prerequisites.push_back("focus = ColonialInd" + Home->getTag());
+	newFocus->mutuallyExclusive = "focus = StrengthenColonies" + Home->getTag();
+	newFocus->xPos =  26;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 10\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_ideas = improved_resource_industry";
+	focuses.push_back(newFocus);
+
+	//establish colonial army
+	newFocus = new HoI4Focus;
+	newFocus->id = "ColonialArmy" + Home->getTag();
+	newFocus->icon = "GFX_goal_generic_allies_build_infantry";
+	newFocus->text += "Establish Colonial Army";
+	newFocus->prerequisites.push_back("focus = StrengthenColonies" + Home->getTag());
+	newFocus->xPos =  28;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 10\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_ideas = militarism_focus";
+	focuses.push_back(newFocus);
+
+	//establish protectorate
+	if (targetColonies.size() >= 1)
+	{
+		auto target = targetColonies.front();
+
+		newFocus = new HoI4Focus;
+		newFocus->id = "Protectorate" + Home->getTag() + target->getTag();
+		newFocus->icon = "GFX_goal_generic_major_war";
+		newFocus->text += "Establish Protectorate over " + target->getSourceCountry()->getName("english");
+		newFocus->available += "			" + target->getTag() + " = { is_in_faction = no }";
+		newFocus->prerequisites.push_back("focus = ColonialArmy" + Home->getTag());
+		newFocus->xPos = 28;
+		newFocus->yPos = 3;
+		newFocus->cost = 10;
+		newFocus->bypass += "			OR = {\n";
+		newFocus->bypass += "				" + Home->getTag() + " = {\n";
+		newFocus->bypass += "					is_in_faction_with = " + target->getTag() +"\n";
+		newFocus->bypass += "					has_war_with = " + target->getTag() + "\n";
+		newFocus->bypass += "				}\n";
+		newFocus->bypass += "				NOT = { country_exists = " + target->getTag() + " }\n";
+		newFocus->bypass += "			}";
+		newFocus->aiWillDo += "			factor = 10\n";
+		newFocus->aiWillDo += "			modifier = {\n";
+		newFocus->aiWillDo += "				factor = 0\n";
+		newFocus->aiWillDo += "				strength_ratio = { tag = " + target->getTag() + " ratio < 1 }\n";
+		newFocus->aiWillDo += "			}";
+		newFocus->completionReward += "			create_wargoal = {\n";
+		newFocus->completionReward += "				type = annex_everything\n";
+		newFocus->completionReward += "				target = " + target->getTag() + "\n";
+		newFocus->completionReward += "			}";
+		focuses.push_back(newFocus);
+	}
+	if (targetColonies.size() >= 2)
+	{
+		auto target = targetColonies.back();
+
+		newFocus = new HoI4Focus;
+		newFocus->id = "Protectorate" + Home->getTag() + target->getTag();
+		newFocus->icon = "GFX_goal_generic_major_war";
+		newFocus->text += "Establish Protectorate over " + target->getSourceCountry()->getName("english");
+		newFocus->available += "			" + target->getTag() + " = { is_in_faction = no }";
+		newFocus->prerequisites.push_back("focus = Protectorate" + Home->getTag() + targetColonies.front()->getTag());
+		newFocus->xPos = 28;
+		newFocus->yPos = 4;
+		newFocus->cost = 10;
+		newFocus->bypass += "			OR = {\n";
+		newFocus->bypass += "				" + Home->getTag() + " = {\n";
+		newFocus->bypass += "					is_in_faction_with = " + target->getTag() +"\n";
+		newFocus->bypass += "					has_war_with = " + target->getTag() + "\n";
+		newFocus->bypass += "				}\n";
+		newFocus->bypass += "				NOT = { country_exists = " + target->getTag() + " }\n";
+		newFocus->bypass += "			}";
+		newFocus->aiWillDo += "			factor = 5\n";
+		newFocus->aiWillDo += "			modifier = {\n";
+		newFocus->aiWillDo += "				factor = 0\n";
+		newFocus->aiWillDo += "				strength_ratio = { tag = " + target->getTag() + " ratio < 1 }\n";
+		newFocus->aiWillDo += "			}";
+		newFocus->completionReward += "			create_wargoal = {\n";
+		newFocus->completionReward += "				type = annex_everything\n";
+		newFocus->completionReward += "				target = " + target->getTag() + "\n";
+		newFocus->completionReward += "			}";
+		focuses.push_back(newFocus);
+	}
+
+	//Trade Empire
+	newFocus = new HoI4Focus;
+	newFocus->id = "TradeEmpire" + Home->getTag();
+	newFocus->icon = "GFX_goal_anschluss";
+	newFocus->text += "Fund the " + Home->getSourceCountry()->getAdjective("english") + " Colonial Trade Corporation";
+	newFocus->prerequisites.push_back("focus = ColonialHwy" + Home->getTag() + " focus = ResourceFac" + Home->getTag());
+	newFocus->xPos =  25;
+	newFocus->yPos = 4;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 10\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_ideas = established_traders";
+	newFocus->completionReward += "			set_country_flag = established_traders";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = infrastructure\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = no\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = infrastructure\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = no\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 2\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = dockyard\n";
+	newFocus->completionReward += "					level = 2\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	//Home Industry Buildup
+	newFocus = new HoI4Focus;
+	newFocus->id = "IndHome" + Home->getTag();
+	newFocus->icon = "GFX_goal_generic_production";
+	newFocus->text += "Fund Industrial Improvement";
+	newFocus->prerequisites.push_back("focus = StrengthenHome" + Home->getTag());
+	newFocus->xPos =  31;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 10";
+	//newFocus->completionReward += "			research_time_factor = -0.1;
+	focuses.push_back(newFocus);
+
+	//National Highway
+	newFocus = new HoI4Focus;
+	newFocus->id = "NationalHwy" + Home->getTag();
+	newFocus->icon = "GFX_goal_generic_construct_infrastructure";
+	newFocus->text += "National Highway";
+	newFocus->prerequisites.push_back("focus = IndHome" + Home->getTag());
+	newFocus->xPos =  30;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 10\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = infrastructure\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = infrastructure\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = infrastructure\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = infrastructure\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = infrastructure\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = infrastructure\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = infrastructure\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = infrastructure\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = infrastructure\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	//National College
+	newFocus = new HoI4Focus;
+	newFocus->id = "NatCollege" + Home->getTag();
+	newFocus->icon = "GFX_goal_anschluss";
+	newFocus->text += "Establish National College";
+	newFocus->prerequisites.push_back("focus = IndHome" + Home->getTag());
+	newFocus->xPos =  32;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 10";
+	newFocus->completionReward += "			add_ideas = national_college";
+	focuses.push_back(newFocus);
+
+	//Improve Factories
+	newFocus = new HoI4Focus;
+	newFocus->id = "MilitaryBuildup" + Home->getTag();
+	newFocus->icon = "GFX_goal_generic_construct_mil_factory";
+	newFocus->text += "Military Buildup";
+	newFocus->prerequisites.push_back("focus = NatCollege" + Home->getTag());
+	newFocus->prerequisites.push_back("focus = NationalHwy" + Home->getTag());
+	newFocus->xPos =  31;
+	newFocus->yPos = 4;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 10\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = arms_factory\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = arms_factory\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = arms_factory\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = arms_factory\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = arms_factory\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = arms_factory\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}\n";
+	newFocus->completionReward += "			random_owned_state = {\n";
+	newFocus->completionReward += "				limit = {\n";
+	newFocus->completionReward += "					free_building_slots = {\n";
+	newFocus->completionReward += "						building = arms_factory\n";
+	newFocus->completionReward += "						size > 0\n";
+	newFocus->completionReward += "						include_locked = yes\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "					OR = {\n";
+	newFocus->completionReward += "						is_in_home_area = yes\n";
+	newFocus->completionReward += "						NOT = {\n";
+	newFocus->completionReward += "							owner = {\n";
+	newFocus->completionReward += "								any_owned_state = {\n";
+	newFocus->completionReward += "									free_building_slots = {\n";
+	newFocus->completionReward += "										building = arms_factory\n";
+	newFocus->completionReward += "										size > 0\n";
+	newFocus->completionReward += "										include_locked = yes\n";
+	newFocus->completionReward += "									}\n";
+	newFocus->completionReward += "									is_in_home_area = yes\n";
+	newFocus->completionReward += "								}\n";
+	newFocus->completionReward += "							}\n";
+	newFocus->completionReward += "						}\n";
+	newFocus->completionReward += "					}\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "				add_extra_state_shared_building_slots = 1\n";
+	newFocus->completionReward += "				add_building_construction = {\n";
+	newFocus->completionReward += "					type = arms_factory\n";
+	newFocus->completionReward += "					level = 1\n";
+	newFocus->completionReward += "					instant_build = yes\n";
+	newFocus->completionReward += "				}\n";
+	newFocus->completionReward += "			}";
+	focuses.push_back(newFocus);
+
+	//PrepBorder
+	newFocus = new HoI4Focus;
+	newFocus->id = "PrepTheBorder" + Home->getTag();
+	newFocus->icon = "GFX_goal_generic_defence";
+	newFocus->text += "Prepare the Border";
+	newFocus->prerequisites.push_back("focus = StrengthenHome" + Home->getTag());
+	newFocus->xPos =  34;
+	newFocus->yPos = 2;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 10\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_ideas = border_buildup";
+	focuses.push_back(newFocus);
+
+	//Promote Nationalistic Spirit
+	newFocus = new HoI4Focus;
+	newFocus->id = "NatSpirit" + Home->getTag();
+	newFocus->icon = "GFX_goal_generic_political_pressure";
+	newFocus->text += "Promote Nationalistic Spirit";
+	newFocus->prerequisites.push_back("focus = PrepTheBorder" + Home->getTag());
+	newFocus->xPos =  34;
+	newFocus->yPos = 3;
+	newFocus->cost = 10;
+	newFocus->aiWillDo += "			factor = 10\n";
+	newFocus->aiWillDo += "			modifier = {\n";
+	newFocus->aiWillDo += "			}";
+	newFocus->completionReward += "			add_ideas = paramilitarism_focus";
+	focuses.push_back(newFocus);
+
+	//ANNEX
+	if (annexationTargets.size() >= 1)
+	{
+		auto target = annexationTargets.front();
+
+		newFocus = new HoI4Focus;
+		newFocus->id = "Annex" + Home->getTag() + target->getTag();
+		newFocus->icon = "GFX_goal_generic_major_war";
+		newFocus->text += "Conquer " + target->getSourceCountry()->getName("english");
+		newFocus->available += "			" + target->getTag() + " = { is_in_faction = no }";
+		newFocus->prerequisites.push_back("focus = PrepTheBorder" + Home->getTag());
+		newFocus->xPos = 36;
+		newFocus->yPos = 3;
+		newFocus->cost = 10;
+		newFocus->bypass += "			OR = {\n";
+		newFocus->bypass += "				" + Home->getTag() + " = {\n";
+		newFocus->bypass += "					is_in_faction_with = " + target->getTag() + "\n";
+		newFocus->bypass += "					has_war_with = " + target->getTag() + "\n";
+		newFocus->bypass += "				}\n";
+		newFocus->bypass += "				NOT = { country_exists = " + target->getTag() + " }\n";
+		newFocus->bypass += "			}";
+		newFocus->aiWillDo += "			factor = 5\n";
+		newFocus->aiWillDo += "			modifier = {\n";
+		newFocus->aiWillDo += "				factor = 0\n";
+		newFocus->aiWillDo += "				strength_ratio = { tag = " + target->getTag() + " ratio < 1 }\n";
+		newFocus->aiWillDo += "			}";
+		newFocus->completionReward += "			create_wargoal = {\n";
+		newFocus->completionReward += "				type = annex_everything\n";
+		newFocus->completionReward += "				target = " + target->getTag() + "\n";
+		newFocus->completionReward += "			}";
+		focuses.push_back(newFocus);
+	}
+	if (annexationTargets.size() >= 2)
+	{
+		auto target = annexationTargets.back();
+
+		newFocus = new HoI4Focus;
+		newFocus->id = "Annex" + Home->getTag() + target->getTag();
+		newFocus->icon = "GFX_goal_generic_major_war";
+		newFocus->text += "Conquer " + target->getSourceCountry()->getName("english");
+		newFocus->available += "			" + target->getTag() + " = { is_in_faction = no }";
+		newFocus->prerequisites.push_back("focus = NatSpirit" + Home->getTag());
+		newFocus->xPos = 34;
+		newFocus->yPos = 4;
+		newFocus->cost = 10;
+		newFocus->bypass += "			OR = {\n";
+		newFocus->bypass += "				" + Home->getTag() + " = {\n";
+		newFocus->bypass += "					is_in_faction_with = " + target->getTag() + "\n";
+		newFocus->bypass += "					has_war_with = " + target->getTag() + "\n";
+		newFocus->bypass += "				}\n";
+		newFocus->bypass += "				NOT = { country_exists = " + target->getTag() + " }\n";
+		newFocus->bypass += "			}";
+		newFocus->aiWillDo += "			factor = 5\n";
+		newFocus->aiWillDo += "			modifier = {\n";
+		newFocus->aiWillDo += "				factor = 0\n";
+		newFocus->aiWillDo += "				strength_ratio = { tag = " + target->getTag() + " ratio < 1 }\n";
+		newFocus->aiWillDo += "			}";
+		newFocus->completionReward += "			create_wargoal = {\n";
+		newFocus->completionReward += "				type = annex_everything\n";
+		newFocus->completionReward += "				target = " + target->getTag() + "\n";
+		newFocus->completionReward += "			}";
+		focuses.push_back(newFocus);
+	}
+}
+
+
+void HoI4FocusTree::output()
+{
+	if (!Utils::TryCreateFolder("Output/" + Configuration::getOutputName() + "/common/national_focus"))
+	{
+		LOG(LogLevel::Error) << "Could not create \"Output/" + Configuration::getOutputName() + "/common/national_focus\"";
+		exit(-1);
+	}
+
+	string filename("Output/" + Configuration::getOutputName() + "/common/national_focus/" + srcCountryTag + "_NF.txt");
+	ofstream out(filename);
+	if (!out.is_open())
+	{
+		LOG(LogLevel::Error) << "Could not create " << filename;
+		exit(-1);
+	}
+
+	out << "focus_tree = {\n";
+	out << "	id = " << dstCountryTag + "_focus\n";
+	out << "	\n";
+	out << "	country = {\n";
+	out << "		factor = 0\n";
+	out << "		\n";
+	out << "		modifier = {\n";
+	out << "			add = 10\n";
+	out << "			tag = " << dstCountryTag << "\n";
+	out << "		}\n";
+	out << "	}\n";
+	out << "	\n";
+	out << "	default = no\n";
+	out << "\n";
+
+	for (auto focus: focuses)
+	{
+		out << *focus;
+		out <<"\n";
+	}
+
+	out << "}";
+
+	out.close();
 }
\ No newline at end of file

From 26b48157d289a71f1f57ff869ad5957b9c06abb7 Mon Sep 17 00:00:00 2001
From: Hamiller78 <Kneesch@gmx.de>
Date: Tue, 7 Feb 2017 21:58:53 +0100
Subject: [PATCH 2/3] Corrected generic focus trees also for HoI4 V1.3.

---
 Vic2ToHoI4/Source/HOI4World/HoI4FocusTree.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Vic2ToHoI4/Source/HOI4World/HoI4FocusTree.cpp b/Vic2ToHoI4/Source/HOI4World/HoI4FocusTree.cpp
index 4dd30b068..8e892035f 100644
--- a/Vic2ToHoI4/Source/HOI4World/HoI4FocusTree.cpp
+++ b/Vic2ToHoI4/Source/HOI4World/HoI4FocusTree.cpp
@@ -3368,8 +3368,7 @@ void HoI4FocusTree::addVersion1_3GenericFocusTree()
 	newFocus = new HoI4Focus;
 	newFocus->id = "ideological_fanaticism";
 	newFocus->icon = "GFX_goal_generic_demand_territory";
-	newFocus->prerequisites.push_back("focus = paramilitarism");
-	newFocus->prerequisites.push_back("focus = political_commissars");
+	newFocus->prerequisites.push_back("focus = paramilitarism focus = political_commissars");
 	newFocus->xPos = 17;
 	newFocus->yPos = 6;
 	newFocus->cost = 10;
@@ -3387,8 +3386,7 @@ void HoI4FocusTree::addVersion1_3GenericFocusTree()
 	newFocus = new HoI4Focus;
 	newFocus->id = "technology_sharing";
 	newFocus->icon = "GFX_goal_generic_scientific_exchange";
-	newFocus->prerequisites.push_back("focus = ideological_fanaticism");
-	newFocus->prerequisites.push_back("focus = why_we_fight");
+	newFocus->prerequisites.push_back("focus = ideological_fanaticism focus = why_we_fight");
 	newFocus->available += "			has_war = yes\n";
 	newFocus->available += "			is_in_faction = yes\n";
 	newFocus->available += "			OR = {\n";

From fe6f3925f48c1b903f85afb2a50d0830e78f805e Mon Sep 17 00:00:00 2001
From: Hamiller78 <Kneesch@gmx.de>
Date: Tue, 7 Feb 2017 22:59:28 +0100
Subject: [PATCH 3/3] makeCustomizedCopy can now handle prerequisites with
 several foci in one field

---
 Vic2ToHoI4/Source/HOI4World/HoI4Focus.cpp | 490 +++++++++++-----------
 1 file changed, 253 insertions(+), 237 deletions(-)

diff --git a/Vic2ToHoI4/Source/HOI4World/HoI4Focus.cpp b/Vic2ToHoI4/Source/HOI4World/HoI4Focus.cpp
index f9384e39e..316d3c6ac 100644
--- a/Vic2ToHoI4/Source/HOI4World/HoI4Focus.cpp
+++ b/Vic2ToHoI4/Source/HOI4World/HoI4Focus.cpp
@@ -1,238 +1,254 @@
-/*Copyright (c) 2017 The Paradox Game Converters Project
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*/
-
-
-
-#include "HoI4Focus.h"
-#include "HoI4Localisation.h"
-
-
-
-HoI4Focus::HoI4Focus()
-{
-	availableIfCapitulated = false;
-}
-
-
-HoI4Focus::HoI4Focus(Object* obj)
-{
-	id = obj->getLeaf("id");
-
-	icon = obj->getLeaf("icon");
-
-	auto textObjs = obj->getValue("text");
-
-	if (textObjs.size() > 0)
-	{
-		text = textObjs[0]->getLeaf();
-	}
-	else
-	{
-		text = "";
-	}
-
-	auto mutuallyExclusiveObjs = obj->getValue("mutuallyExclusive");
-	if (mutuallyExclusiveObjs.size() > 0)
-	{
-		mutuallyExclusive = mutuallyExclusiveObjs[0]->getLeaf();
-	}
-	else
-	{
-		mutuallyExclusive = "";
-	}
-
-	auto bypassObjs = obj->getValue("bypass");
-	if (bypassObjs.size() > 0)
-	{
-		bypass = bypassObjs[0]->getLeaf();
-	}
-	else
-	{
-		bypass = "";
-	}
-
-	xPos = stoi(obj->getLeaf("x"));
-	yPos = stoi(obj->getLeaf("y"));
-	cost = stoi(obj->getLeaf("cost"));
-
-	auto availableIfcapitulatedObjs = obj->getValue("available_if_capitulated");
-	if (
-			(availableIfcapitulatedObjs.size() > 0) &&
-			(availableIfcapitulatedObjs[0]->getLeaf() == "yes")
-		)
-	{
-		availableIfCapitulated = true;
-	}
-
-	auto availableObjs = obj->getValue("available");
-	if (availableObjs.size() > 0)
-	{
-		available = availableObjs[0]->getLeaf();
-	}
-	else
-	{
-		available = "";
-	}
-
-	auto cancelIfInvalidObjs = obj->getValue("cancelIfInvalid");
-	if (cancelIfInvalidObjs.size() > 0)
-	{
-		cancelIfInvalid = cancelIfInvalidObjs[0]->getLeaf();
-	}
-	else
-	{
-		cancelIfInvalid = "";
-	}
-
-	auto continueIfInvalidObjs = obj->getValue("continueIfInvalid");
-	if (continueIfInvalidObjs.size() > 0)
-	{
-		continueIfInvalid = continueIfInvalidObjs[0]->getLeaf();
-	}
-	else
-	{
-		continueIfInvalid = "";
-	}
-
-	auto completeTooltipObjs = obj->getValue("completeTooltip");
-	if (completeTooltipObjs.size() > 0)
-	{
-		completeTooltip = completeTooltipObjs[0]->getLeaf();
-	}
-	else
-	{
-		completeTooltip = "";
-	}
-
-	auto completionRewardObjs = obj->getValue("completion_reward");
-	if (completionRewardObjs.size() > 0)
-	{
-		completionReward = completionRewardObjs[0]->getLeaf();
-	}
-	else
-	{
-		completionReward = "";
-	}
-
-	auto aiWillDoObjs = obj->getValue("aiWillDo");
-	if (aiWillDoObjs.size() > 0)
-	{
-		aiWillDo = aiWillDoObjs[0]->getLeaf();
-	}
-	else
-	{
-		aiWillDo = "";
-	}
-
-	for (auto prereqObj: obj->getValue("prerequisite"))
-	{
-		prerequisites.push_back(prereqObj->getLeaf());
-	}
-}
-
-
-HoI4Focus* HoI4Focus::makeCustomizedCopy(const string& country) const
-{
-	HoI4Focus* newFocus = new HoI4Focus(*this);
-
-	newFocus->id += country;
-	if (newFocus->mutuallyExclusive != "")
-	{
-		newFocus->mutuallyExclusive += country;
-	}
-	newFocus->prerequisites.clear();
-	for (auto prerequisite: prerequisites)
-	{
-		newFocus->prerequisites.push_back(prerequisite + country);
-	}
-
-
-	HoI4Localisation::copyFocusLocalisations(id, newFocus->id);
-
-	return newFocus;
-}
-
-
-ostream& operator << (ostream& output, HoI4Focus& focus)
-{
-	output << "	focus = {\n";
-	output << "		id = " << focus.id << "\n";
-	output << "		icon = " << focus.icon << "\n";
-	if (focus.text != "")
-	{
-		output << "		text = \"" << focus.text << "\"\n";
-	}
-	for (auto prerequisite: focus.prerequisites)
-	{
-		output << "		prerequisite = { " << prerequisite << " }\n";
-	}
-	if (focus.mutuallyExclusive != "")
-	{
-		output << "		mutually_exclusive = { " << focus.mutuallyExclusive << " }\n";
-	}
-	if (focus.bypass != "")
-	{
-		output << "		bypass = {\n";
-		output << focus.bypass << "\n";
-		output << "		}\n";
-	}
-	output << "		x = " << focus.xPos << "\n";
-	output << "		y = " << focus.yPos << "\n";
-	output << "		cost = " << focus.cost << "\n";
-	if (focus.availableIfCapitulated)
-	{
-		output << "		available_if_capitulated = yes\n";
-	}
-	if (focus.available != "")
-	{
-		output << "		available = {\n";
-		output << focus.available;
-		output << "\n";
-		output << "		}\n";
-	}
-	if (focus.cancelIfInvalid != "")
-	{
-		output << "		cancel_if_invalid = " << focus.cancelIfInvalid << "\n";
-	}
-	if (focus.continueIfInvalid != "")
-	{
-		output << "		continue_if_invalid = " << focus.continueIfInvalid << "\n";
-	}
-	if (focus.completeTooltip != "")
-	{
-		output << "		complete_tooltip = {\n";
-		output << focus.completeTooltip << "\n";
-		output << "		}\n";
-	}
-	output << "		completion_reward = {\n";
-	output << focus.completionReward << "\n";
-	output << "		}\n";
-	if (focus.aiWillDo != "")
-	{
-		output << "		ai_will_do = {\n";
-		output << focus.aiWillDo << "\n";
-		output << "		}\n";
-	}
-
-	output << "	}\n";
-
-	return output;
+/*Copyright (c) 2017 The Paradox Game Converters Project
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.*/
+
+
+
+#include "HoI4Focus.h"
+#include "HoI4Localisation.h"
+
+
+
+HoI4Focus::HoI4Focus()
+{
+	availableIfCapitulated = false;
+}
+
+
+HoI4Focus::HoI4Focus(Object* obj)
+{
+	id = obj->getLeaf("id");
+
+	icon = obj->getLeaf("icon");
+
+	auto textObjs = obj->getValue("text");
+
+	if (textObjs.size() > 0)
+	{
+		text = textObjs[0]->getLeaf();
+	}
+	else
+	{
+		text = "";
+	}
+
+	auto mutuallyExclusiveObjs = obj->getValue("mutuallyExclusive");
+	if (mutuallyExclusiveObjs.size() > 0)
+	{
+		mutuallyExclusive = mutuallyExclusiveObjs[0]->getLeaf();
+	}
+	else
+	{
+		mutuallyExclusive = "";
+	}
+
+	auto bypassObjs = obj->getValue("bypass");
+	if (bypassObjs.size() > 0)
+	{
+		bypass = bypassObjs[0]->getLeaf();
+	}
+	else
+	{
+		bypass = "";
+	}
+
+	xPos = stoi(obj->getLeaf("x"));
+	yPos = stoi(obj->getLeaf("y"));
+	cost = stoi(obj->getLeaf("cost"));
+
+	auto availableIfcapitulatedObjs = obj->getValue("available_if_capitulated");
+	if (
+			(availableIfcapitulatedObjs.size() > 0) &&
+			(availableIfcapitulatedObjs[0]->getLeaf() == "yes")
+		)
+	{
+		availableIfCapitulated = true;
+	}
+
+	auto availableObjs = obj->getValue("available");
+	if (availableObjs.size() > 0)
+	{
+		available = availableObjs[0]->getLeaf();
+	}
+	else
+	{
+		available = "";
+	}
+
+	auto cancelIfInvalidObjs = obj->getValue("cancelIfInvalid");
+	if (cancelIfInvalidObjs.size() > 0)
+	{
+		cancelIfInvalid = cancelIfInvalidObjs[0]->getLeaf();
+	}
+	else
+	{
+		cancelIfInvalid = "";
+	}
+
+	auto continueIfInvalidObjs = obj->getValue("continueIfInvalid");
+	if (continueIfInvalidObjs.size() > 0)
+	{
+		continueIfInvalid = continueIfInvalidObjs[0]->getLeaf();
+	}
+	else
+	{
+		continueIfInvalid = "";
+	}
+
+	auto completeTooltipObjs = obj->getValue("completeTooltip");
+	if (completeTooltipObjs.size() > 0)
+	{
+		completeTooltip = completeTooltipObjs[0]->getLeaf();
+	}
+	else
+	{
+		completeTooltip = "";
+	}
+
+	auto completionRewardObjs = obj->getValue("completion_reward");
+	if (completionRewardObjs.size() > 0)
+	{
+		completionReward = completionRewardObjs[0]->getLeaf();
+	}
+	else
+	{
+		completionReward = "";
+	}
+
+	auto aiWillDoObjs = obj->getValue("aiWillDo");
+	if (aiWillDoObjs.size() > 0)
+	{
+		aiWillDo = aiWillDoObjs[0]->getLeaf();
+	}
+	else
+	{
+		aiWillDo = "";
+	}
+
+	for (auto prereqObj: obj->getValue("prerequisite"))
+	{
+		prerequisites.push_back(prereqObj->getLeaf());
+	}
+}
+
+
+HoI4Focus* HoI4Focus::makeCustomizedCopy(const string& country) const
+{
+	HoI4Focus* newFocus = new HoI4Focus(*this);
+
+	newFocus->id += country;
+	if (newFocus->mutuallyExclusive != "")
+	{
+		newFocus->mutuallyExclusive += country;
+	}
+	newFocus->prerequisites.clear();
+	for (auto prerequisite: prerequisites)
+	{
+		//have to account for several foci in one prerequisite, so need to look for occurences of " focus" and insert country before that
+		int stringPosition = 0;
+		do
+		{
+			int focusPosition = prerequisite.find(" focus", stringPosition);
+			if (focusPosition != string::npos)
+			{
+				prerequisite.insert(focusPosition, country);
+				stringPosition = focusPosition + country.size() + 6;
+			}
+			else
+			{
+				stringPosition = prerequisite.size();
+			}
+		}
+		while(stringPosition < prerequisite.size());
+		newFocus->prerequisites.push_back(prerequisite + country);
+	}
+
+
+	HoI4Localisation::copyFocusLocalisations(id, newFocus->id);
+
+	return newFocus;
+}
+
+
+ostream& operator << (ostream& output, HoI4Focus& focus)
+{
+	output << "	focus = {\n";
+	output << "		id = " << focus.id << "\n";
+	output << "		icon = " << focus.icon << "\n";
+	if (focus.text != "")
+	{
+		output << "		text = \"" << focus.text << "\"\n";
+	}
+	for (auto prerequisite: focus.prerequisites)
+	{
+		output << "		prerequisite = { " << prerequisite << " }\n";
+	}
+	if (focus.mutuallyExclusive != "")
+	{
+		output << "		mutually_exclusive = { " << focus.mutuallyExclusive << " }\n";
+	}
+	if (focus.bypass != "")
+	{
+		output << "		bypass = {\n";
+		output << focus.bypass << "\n";
+		output << "		}\n";
+	}
+	output << "		x = " << focus.xPos << "\n";
+	output << "		y = " << focus.yPos << "\n";
+	output << "		cost = " << focus.cost << "\n";
+	if (focus.availableIfCapitulated)
+	{
+		output << "		available_if_capitulated = yes\n";
+	}
+	if (focus.available != "")
+	{
+		output << "		available = {\n";
+		output << focus.available;
+		output << "\n";
+		output << "		}\n";
+	}
+	if (focus.cancelIfInvalid != "")
+	{
+		output << "		cancel_if_invalid = " << focus.cancelIfInvalid << "\n";
+	}
+	if (focus.continueIfInvalid != "")
+	{
+		output << "		continue_if_invalid = " << focus.continueIfInvalid << "\n";
+	}
+	if (focus.completeTooltip != "")
+	{
+		output << "		complete_tooltip = {\n";
+		output << focus.completeTooltip << "\n";
+		output << "		}\n";
+	}
+	output << "		completion_reward = {\n";
+	output << focus.completionReward << "\n";
+	output << "		}\n";
+	if (focus.aiWillDo != "")
+	{
+		output << "		ai_will_do = {\n";
+		output << focus.aiWillDo << "\n";
+		output << "		}\n";
+	}
+
+	output << "	}\n";
+
+	return output;
 }
\ No newline at end of file