Clang-format formatting (with manual cleanup)

12 files changed, 323 insertions, 252 deletions

diff --git a/src/openvic-simulation/testing/Requirement.cpp b/src/openvic-simulation/testing/Requirement.cpp
index be4138d..99a29de 100644
--- a/src/openvic-simulation/testing/Requirement.cpp
+++ b/src/openvic-simulation/testing/Requirement.cpp
@@ -37,7 +37,7 @@ void Requirement::set_acceptance_criteria(std::string in_acceptance_criteria) {
 }
 void Requirement::set_pass(bool in_pass) {
 	pass = in_pass;
-	set_tested(true);	// Ever setting a pass condition implies it has been tested
+	set_tested(true); // Ever setting a pass condition implies it has been tested
 }
 void Requirement::set_tested(bool in_tested) {
 	tested = in_tested;
diff --git a/src/openvic-simulation/testing/Requirement.hpp b/src/openvic-simulation/testing/Requirement.hpp
index caea5c6..20dad3d 100644
--- a/src/openvic-simulation/testing/Requirement.hpp
+++ b/src/openvic-simulation/testing/Requirement.hpp
@@ -9,7 +9,7 @@ namespace OpenVic {
 		std::string id;
 		std::string text;
 		std::string acceptance_criteria;
-		bool pass = false;	// Explicitly false to begin
+		bool pass = false; // Explicitly false to begin
 		bool tested = false;
 
 		// Initialised and used during script execution
@@ -17,7 +17,6 @@ namespace OpenVic {
 		std::string actual_value;
 
 	public:
-
 		Requirement(std::string in_id, std::string in_text, std::string in_acceptance_criteria) {
 			id = in_id;
 			text = in_text;
diff --git a/src/openvic-simulation/testing/TestScript.cpp b/src/openvic-simulation/testing/TestScript.cpp
index d08f34c..a238fb5 100644
--- a/src/openvic-simulation/testing/TestScript.cpp
+++ b/src/openvic-simulation/testing/TestScript.cpp
@@ -15,7 +15,7 @@ Requirement* TestScript::get_requirement_by_id(std::string id) {
 			return req;
 		}
 	}
-	return new Requirement("NULL", "NULL", "NULL");	// edge case of failing to find
+	return new Requirement("NULL", "NULL", "NULL"); // edge case of failing to find
 }
 std::vector<Requirement*> TestScript::get_passed_requirements() {
 	std::vector<Requirement*> passed_requirements = std::vector<Requirement*>();
@@ -66,8 +66,9 @@ void TestScript::set_script_name(std::string in_script_name) {
 }
 
 // Methods
-void TestScript::pass_or_fail_req_with_actual_and_target_values(std::string req_name, std::string target_value,
-	std::string actual_value) {
+void TestScript::pass_or_fail_req_with_actual_and_target_values(
+	std::string req_name, std::string target_value, std::string actual_value
+) {
 	Requirement* req = get_requirement_by_id(req_name);
 	req->set_target_value(target_value);
 	req->set_actual_value(actual_value);
diff --git a/src/openvic-simulation/testing/TestScript.hpp b/src/openvic-simulation/testing/TestScript.hpp
index c278323..bfc2e95 100644
--- a/src/openvic-simulation/testing/TestScript.hpp
+++ b/src/openvic-simulation/testing/TestScript.hpp
@@ -1,7 +1,8 @@
 #pragma once
-#include <testing/Requirement.hpp>
 #include <vector>
-#include <GameManager.hpp>
+
+#include "openvic-simulation/GameManager.hpp"
+#include "openvic-simulation/testing/Requirement.hpp"
 
 namespace OpenVic {
 
@@ -12,7 +13,6 @@ namespace OpenVic {
 		std::string script_name;
 
 	public:
-
 		// expects an overriden method that performs arbitrary code execution
 		// so that each script uniquely performs tests
 		// for both requirement adding to script and to execute code
@@ -36,6 +36,8 @@ namespace OpenVic {
 		void set_script_name(std::string in_script_name);
 
 		// Methods
-		void pass_or_fail_req_with_actual_and_target_values(std::string req_name, std::string target_value, std::string actual_value);
+		void pass_or_fail_req_with_actual_and_target_values(
+			std::string req_name, std::string target_value, std::string actual_value
+		);
 	};
 }
diff --git a/src/openvic-simulation/testing/Testing.cpp b/src/openvic-simulation/testing/Testing.cpp
index 883c4f6..da9dccf 100644
--- a/src/openvic-simulation/testing/Testing.cpp
+++ b/src/openvic-simulation/testing/Testing.cpp
@@ -1,7 +1,9 @@
-#include <testing/Testing.hpp>
-#include <testing/TestScript.hpp>
+#include "Testing.hpp"
+
 #include <fstream>
 
+#include "openvic-simulation/testing/TestScript.hpp"
+
 using namespace OpenVic;
 
 Testing::Testing(GameManager* game_manager) {
diff --git a/src/openvic-simulation/testing/Testing.hpp b/src/openvic-simulation/testing/Testing.hpp
index 670c95a..18ade0a 100644
--- a/src/openvic-simulation/testing/Testing.hpp
+++ b/src/openvic-simulation/testing/Testing.hpp
@@ -1,22 +1,21 @@
 #pragma once
-#include <testing/TestScript.hpp>
-#include <GameManager.hpp>
 #include <iostream>
 #include <vector>
 
-#include <testing/test_scripts/A_001_file_tests.cpp>
-#include <testing/test_scripts/A_002_economy_tests.cpp>
-#include <testing/test_scripts/A_003_military_unit_tests.cpp>
-#include <testing/test_scripts/A_004_networking_tests.cpp>
-#include <testing/test_scripts/A_005_nation_tests.cpp>
-#include <testing/test_scripts/A_006_politics_tests.cpp>
+#include "openvic-simulation/GameManager.hpp"
+#include "openvic-simulation/testing/TestScript.hpp"
+#include "openvic-simulation/testing/test_scripts/A_001_file_tests.cpp"
+#include "openvic-simulation/testing/test_scripts/A_002_economy_tests.cpp"
+#include "openvic-simulation/testing/test_scripts/A_003_military_unit_tests.cpp"
+#include "openvic-simulation/testing/test_scripts/A_004_networking_tests.cpp"
+#include "openvic-simulation/testing/test_scripts/A_005_nation_tests.cpp"
+#include "openvic-simulation/testing/test_scripts/A_006_politics_tests.cpp"
 
 namespace OpenVic {
 
 	class Testing {
 
 	public:
-
 		Testing(GameManager* game_manager);
 		~Testing();
 
diff --git a/src/openvic-simulation/testing/test_scripts/A_001_file_tests.cpp b/src/openvic-simulation/testing/test_scripts/A_001_file_tests.cpp
index c79e602..e24d44c 100644
--- a/src/openvic-simulation/testing/test_scripts/A_001_file_tests.cpp
+++ b/src/openvic-simulation/testing/test_scripts/A_001_file_tests.cpp
@@ -1,5 +1,5 @@
-# include <testing/TestScript.hpp>
-# include <GameManager.hpp>
+#include "openvic-simulation/GameManager.hpp"
+#include "openvic-simulation/testing/TestScript.hpp"
 
 namespace OpenVic {
 	class A_001_file_tests : public TestScript {
@@ -11,92 +11,121 @@ namespace OpenVic {
 		}
 
 		void add_requirements() {
-			Requirement* FS_44 = new Requirement("FS_44",
-				"The icon for the Canned Food good shall be loaded from the R/art/economy/goods folder with the filename Canned Food.png",
-				"The icon for the Canned Food good has been loaded into the program");
+			Requirement* FS_44 = new Requirement(
+				"FS_44",
+				"The icon for the Canned Food good shall be loaded from the R/art/economy/goods folder with the filename "
+				"Canned Food.png",
+				"The icon for the Canned Food good has been loaded into the program"
+			);
 			add_requirement(FS_44);
-			Requirement* FS_48 = new Requirement("FS_48",
+			Requirement* FS_48 = new Requirement(
+				"FS_48",
 				"The icon for the Coal good shall be loaded from the R/art/economy/goods folder with the filename Coal.png",
-				"The icon for the Coal good has been loaded into the program");
+				"The icon for the Coal good has been loaded into the program"
+			);
 			add_requirement(FS_48);
-			Requirement* FS_61 = new Requirement("FS_61",
+			Requirement* FS_61 = new Requirement(
+				"FS_61",
 				"The icon for the Grain good shall be loaded from the R/art/economy/goods folder with the filename Grain.png",
-				"The icon for the Grain good has been loaded into the program");
+				"The icon for the Grain good has been loaded into the program"
+			);
 			add_requirement(FS_61);
-			Requirement* FS_62 = new Requirement("FS_62",
+			Requirement* FS_62 = new Requirement(
+				"FS_62",
 				"The icon for the Iron good shall be loaded from the R/art/economy/goods folder with the filename Iron.png",
-				"The icon for the Iron good has been loaded into the program");
+				"The icon for the Iron good has been loaded into the program"
+			);
 			add_requirement(FS_62);
-			Requirement* FS_63 = new Requirement("FS_63",
+			Requirement* FS_63 = new Requirement(
+				"FS_63",
 				"The icon for the Liquor good shall be loaded from the R/art/economy/goods folder with the filename Liquor.png",
-				"The icon for the Liquor good has been loaded into the program");
+				"The icon for the Liquor good has been loaded into the program"
+			);
 			add_requirement(FS_63);
-			Requirement* FS_67 = new Requirement("FS_67",
-				"The icon for the Machine Parts good shall be loaded from the R/art/economy/goods folder with the filename Machine Parts.png",
-				"The icon for the Machine Parts good has been loaded into the program");
+			Requirement* FS_67 = new Requirement(
+				"FS_67",
+				"The icon for the Machine Parts good shall be loaded from the R/art/economy/goods folder with the filename "
+				"Machine Parts.png",
+				"The icon for the Machine Parts good has been loaded into the program"
+			);
 			add_requirement(FS_67);
-			Requirement* FS_86 = new Requirement("FS_86",
+			Requirement* FS_86 = new Requirement(
+				"FS_86",
 				"The icon for the Wool good shall be loaded from the R/art/economy/goods folder with the filename Wool.png",
-				"The icon for the Wool good has been loaded into the program");
+				"The icon for the Wool good has been loaded into the program"
+			);
 			add_requirement(FS_86);
-			Requirement* FS_2 = new Requirement("FS_2",
-				"User provided data shall be saved to an 'OpenVic' folder, located following platform convention",
-				"User data is saved to the correct place");
+			Requirement* FS_2 = new Requirement(
+				"FS_2", "User provided data shall be saved to an 'OpenVic' folder, located following platform convention",
+				"User data is saved to the correct place"
+			);
 			add_requirement(FS_2);
-			Requirement* FS_20 = new Requirement("FS_20",
-				"On Windows, user provided data shall be saved by default to '%APPDATA%/OpenVic/'",
-				"User data is saved to the correct place");
+			Requirement* FS_20 = new Requirement(
+				"FS_20", "On Windows, user provided data shall be saved by default to '%APPDATA%/OpenVic/'",
+				"User data is saved to the correct place"
+			);
 			add_requirement(FS_20);
-			Requirement* FS_21 = new Requirement("FS_21",
-				"On Linux, user provided data shall be saved by default to '~/.local/share/OpenVic/'",
-				"User data is saved to the correct place");
+			Requirement* FS_21 = new Requirement(
+				"FS_21", "On Linux, user provided data shall be saved by default to '~/.local/share/OpenVic/'",
+				"User data is saved to the correct place"
+			);
 			add_requirement(FS_21);
-			Requirement* FS_22 = new Requirement("FS_22",
-				"On macOS, user provided data shall be saved by default to '~/Library/Application Support/OpenVic/'",
-				"User data is saved to the correct place");
+			Requirement* FS_22 = new Requirement(
+				"FS_22", "On macOS, user provided data shall be saved by default to '~/Library/Application Support/OpenVic/'",
+				"User data is saved to the correct place"
+			);
 			add_requirement(FS_22);
-			Requirement* FS_24 = new Requirement("FS_24",
-				"All .csv files in the locale folder shall contain translation keys and translations",
-				"No errant files in locale directory");
+			Requirement* FS_24 = new Requirement(
+				"FS_24", "All .csv files in the locale folder shall contain translation keys and translations",
+				"No errant files in locale directory"
+			);
 			add_requirement(FS_24);
-			Requirement* FS_17 = new Requirement("FS_17",
-				"List of available locales are loaded from R/localisation/ directory",
-				"Locales loaded correctly");
+			Requirement* FS_17 = new Requirement(
+				"FS_17", "List of available locales are loaded from R/localisation/ directory", "Locales loaded correctly"
+			);
 			add_requirement(FS_17);
-			Requirement* FS_333 = new Requirement("FS_333",
-				"The map's provinces shall be defined by unique colours in 'R/map/provinces.bmp'",
-				"The unique colours of 'R/map/provinces.bmp' define provinces");
+			Requirement* FS_333 = new Requirement(
+				"FS_333", "The map's provinces shall be defined by unique colours in 'R/map/provinces.bmp'",
+				"The unique colours of 'R/map/provinces.bmp' define provinces"
+			);
 			add_requirement(FS_333);
-			Requirement* FS_335 = new Requirement("FS_335",
-				"Unique province IDs shall be associated with their unique colours in 'R/map/definition.csv'",
-				"'R/map/definition.csv' associates every unique colour used to define a province with a unique ID");
+			Requirement* FS_335 = new Requirement(
+				"FS_335", "Unique province IDs shall be associated with their unique colours in 'R/map/definition.csv'",
+				"'R/map/definition.csv' associates every unique colour used to define a province with a unique ID"
+			);
 			add_requirement(FS_335);
-			Requirement* FS_334 = new Requirement("FS_334",
-				"Water provinces shall be defined by a list of their IDs in 'R/map/default.map'",
-				"'R/map/default.map' contains a list of province IDs which are used to define water provinces");
+			Requirement* FS_334 = new Requirement(
+				"FS_334", "Water provinces shall be defined by a list of their IDs in 'R/map/default.map'",
+				"'R/map/default.map' contains a list of province IDs which are used to define water provinces"
+			);
 			add_requirement(FS_334);
-			Requirement* FS_338 = new Requirement("FS_338",
+			Requirement* FS_338 = new Requirement(
+				"FS_338",
 				"The image for the minimap background shall be loaded from the R/art/ui folder with the filename minimap.png",
-				"The image for the minimap background has been loaded into the program");
+				"The image for the minimap background has been loaded into the program"
+			);
 			add_requirement(FS_338);
-			Requirement* FS_343 = new Requirement("FS_343",
-				"The textures making up the cosmetic terrain map shall be loaded from the R/art/terrain folder",
-				"The textures making up the cosmetic terrain map have been loaded into the program");
+			Requirement* FS_343 = new Requirement(
+				"FS_343", "The textures making up the cosmetic terrain map shall be loaded from the R/art/terrain folder",
+				"The textures making up the cosmetic terrain map have been loaded into the program"
+			);
 			add_requirement(FS_343);
-			Requirement* FS_341 = new Requirement("FS_341",
-				"State areas shall be defined by lists of province IDs in 'R/map/region.txt'",
-				"'R/map/region.txt' defines state areas with lists of province IDs");
+			Requirement* FS_341 = new Requirement(
+				"FS_341", "State areas shall be defined by lists of province IDs in 'R/map/region.txt'",
+				"'R/map/region.txt' defines state areas with lists of province IDs"
+			);
 			add_requirement(FS_341);
-			Requirement* SND_10 = new Requirement("SND_10",
-				"SFX shall be refered to by their filename, without the extension",
-				"Sound effects are identified by their filename without extension");
+			Requirement* SND_10 = new Requirement(
+				"SND_10", "SFX shall be refered to by their filename, without the extension",
+				"Sound effects are identified by their filename without extension"
+			);
 			add_requirement(SND_10);
 		}
 
 		void execute_script() {
 			// FS_44
-			// The icon for the Canned Food good shall be loaded from the R/art/economy/goods folder with the filename Canned Food.png
-			// The icon for the Canned Food good has been loaded into the program
+			// The icon for the Canned Food good shall be loaded from the R/art/economy/goods folder with the filename Canned
+			// Food.png The icon for the Canned Food good has been loaded into the program
 
 			// TODO: Write test steps for FS_44...
 
@@ -125,8 +154,8 @@ namespace OpenVic {
 			// TODO: Write test steps for FS_63...
 
 			// FS_67
-			// The icon for the Machine Parts good shall be loaded from the R/art/economy/goods folder with the filename Machine Parts.png
-			// The icon for the Machine Parts good has been loaded into the program
+			// The icon for the Machine Parts good shall be loaded from the R/art/economy/goods folder with the filename
+			// Machine Parts.png The icon for the Machine Parts good has been loaded into the program
 
 			// TODO: Write test steps for FS_67...
 
@@ -213,7 +242,6 @@ namespace OpenVic {
 			// Sound effects are identified by their filename without extension
 
 			// TODO: Write test steps for SND_10...
-
 		}
 	};
 }
diff --git a/src/openvic-simulation/testing/test_scripts/A_002_economy_tests.cpp b/src/openvic-simulation/testing/test_scripts/A_002_economy_tests.cpp
index 5e1f317..ffe1ee9 100644
--- a/src/openvic-simulation/testing/test_scripts/A_002_economy_tests.cpp
+++ b/src/openvic-simulation/testing/test_scripts/A_002_economy_tests.cpp
@@ -1,5 +1,5 @@
-# include <testing/TestScript.hpp>
-# include <GameManager.hpp>
+#include "openvic-simulation/GameManager.hpp"
+#include "openvic-simulation/testing/TestScript.hpp"
 
 namespace OpenVic {
 	class A_002_economy_tests : public TestScript {
@@ -11,197 +11,245 @@ namespace OpenVic {
 		}
 
 		void add_requirements() {
-			Requirement* ECON_123 = new Requirement("ECON_123",
-				"The base price for Aeroplanes shall be 110",
-				"The base price of 110 for Aeroplanes can be seen in program output data");
+			Requirement* ECON_123 = new Requirement(
+				"ECON_123", "The base price for Aeroplanes shall be 110",
+				"The base price of 110 for Aeroplanes can be seen in program output data"
+			);
 			add_requirement(ECON_123);
-			Requirement* ECON_124 = new Requirement("ECON_124",
-				"The base price for Ammunition shall be 17.5",
-				"The base price of 17.5 for Ammunition can be seen in program output data");
+			Requirement* ECON_124 = new Requirement(
+				"ECON_124", "The base price for Ammunition shall be 17.5",
+				"The base price of 17.5 for Ammunition can be seen in program output data"
+			);
 			add_requirement(ECON_124);
-			Requirement* ECON_125 = new Requirement("ECON_125",
-				"The base price for Artillery shall be 60",
-				"The base price of 60 for Artillery can be seen in program output data");
+			Requirement* ECON_125 = new Requirement(
+				"ECON_125", "The base price for Artillery shall be 60",
+				"The base price of 60 for Artillery can be seen in program output data"
+			);
 			add_requirement(ECON_125);
-			Requirement* ECON_126 = new Requirement("ECON_126",
-				"The base price for Automobiles shall be 70",
-				"The base price of 70 for Automobiles can be seen in program output data");
+			Requirement* ECON_126 = new Requirement(
+				"ECON_126", "The base price for Automobiles shall be 70",
+				"The base price of 70 for Automobiles can be seen in program output data"
+			);
 			add_requirement(ECON_126);
-			Requirement* ECON_127 = new Requirement("ECON_127",
-				"The base price for Canned Food shall be 16",
-				"The base price of 16 for Canned Food can be seen in program output data");
+			Requirement* ECON_127 = new Requirement(
+				"ECON_127", "The base price for Canned Food shall be 16",
+				"The base price of 16 for Canned Food can be seen in program output data"
+			);
 			add_requirement(ECON_127);
-			Requirement* ECON_128 = new Requirement("ECON_128",
-				"The base price for Cattle shall be 2",
-				"The base price of 2 for Cattle can be seen in program output data");
+			Requirement* ECON_128 = new Requirement(
+				"ECON_128", "The base price for Cattle shall be 2",
+				"The base price of 2 for Cattle can be seen in program output data"
+			);
 			add_requirement(ECON_128);
-			Requirement* ECON_129 = new Requirement("ECON_129",
-				"The base price for Cement shall be 16",
-				"The base price of 16 for Cement can be seen in program output data");
+			Requirement* ECON_129 = new Requirement(
+				"ECON_129", "The base price for Cement shall be 16",
+				"The base price of 16 for Cement can be seen in program output data"
+			);
 			add_requirement(ECON_129);
-			Requirement* ECON_130 = new Requirement("ECON_130",
-				"The base price for Clipper Convoys shall be 42",
-				"The base price of 42 for Clipper Convoys can be seen in program output data");
+			Requirement* ECON_130 = new Requirement(
+				"ECON_130", "The base price for Clipper Convoys shall be 42",
+				"The base price of 42 for Clipper Convoys can be seen in program output data"
+			);
 			add_requirement(ECON_130);
-			Requirement* ECON_131 = new Requirement("ECON_131",
-				"The base price for Coal shall be 2.3",
-				"The base price of 2.3 for Coal can be seen in program output data");
+			Requirement* ECON_131 = new Requirement(
+				"ECON_131", "The base price for Coal shall be 2.3",
+				"The base price of 2.3 for Coal can be seen in program output data"
+			);
 			add_requirement(ECON_131);
-			Requirement* ECON_132 = new Requirement("ECON_132",
-				"The base price for Coffee shall be 2.1",
-				"The base price of 2.1 for Coffee can be seen in program output data");
+			Requirement* ECON_132 = new Requirement(
+				"ECON_132", "The base price for Coffee shall be 2.1",
+				"The base price of 2.1 for Coffee can be seen in program output data"
+			);
 			add_requirement(ECON_132);
-			Requirement* ECON_133 = new Requirement("ECON_133",
-				"The base price for Cotton shall be 2",
-				"The base price of 2 for Cotton can be seen in program output data");
+			Requirement* ECON_133 = new Requirement(
+				"ECON_133", "The base price for Cotton shall be 2",
+				"The base price of 2 for Cotton can be seen in program output data"
+			);
 			add_requirement(ECON_133);
-			Requirement* ECON_134 = new Requirement("ECON_134",
-				"The base price for Dye shall be 12",
-				"The base price of 12 for Dye can be seen in program output data");
+			Requirement* ECON_134 = new Requirement(
+				"ECON_134", "The base price for Dye shall be 12",
+				"The base price of 12 for Dye can be seen in program output data"
+			);
 			add_requirement(ECON_134);
-			Requirement* ECON_135 = new Requirement("ECON_135",
-				"The base price for Electric Gear shall be 16",
-				"The base price of 16 for Electric Gear can be seen in program output data");
+			Requirement* ECON_135 = new Requirement(
+				"ECON_135", "The base price for Electric Gear shall be 16",
+				"The base price of 16 for Electric Gear can be seen in program output data"
+			);
 			add_requirement(ECON_135);
-			Requirement* ECON_136 = new Requirement("ECON_136",
-				"The base price for Explosives shall be 20",
-				"The base price of 20 for Explosives can be seen in program output data");
+			Requirement* ECON_136 = new Requirement(
+				"ECON_136", "The base price for Explosives shall be 20",
+				"The base price of 20 for Explosives can be seen in program output data"
+			);
 			add_requirement(ECON_136);
-			Requirement* ECON_137 = new Requirement("ECON_137",
-				"The base price for Fabric shall be 1.8",
-				"The base price of 1.8 for Fabric can be seen in program output data");
+			Requirement* ECON_137 = new Requirement(
+				"ECON_137", "The base price for Fabric shall be 1.8",
+				"The base price of 1.8 for Fabric can be seen in program output data"
+			);
 			add_requirement(ECON_137);
-			Requirement* ECON_138 = new Requirement("ECON_138",
-				"The base price for Fertilizer shall be 10",
-				"The base price of 10 for Fertilizer can be seen in program output data");
+			Requirement* ECON_138 = new Requirement(
+				"ECON_138", "The base price for Fertilizer shall be 10",
+				"The base price of 10 for Fertilizer can be seen in program output data"
+			);
 			add_requirement(ECON_138);
-			Requirement* ECON_139 = new Requirement("ECON_139",
-				"The base price for Fish shall be 1.5",
-				"The base price of 1.5 for Fish can be seen in program output data");
+			Requirement* ECON_139 = new Requirement(
+				"ECON_139", "The base price for Fish shall be 1.5",
+				"The base price of 1.5 for Fish can be seen in program output data"
+			);
 			add_requirement(ECON_139);
-			Requirement* ECON_140 = new Requirement("ECON_140",
-				"The base price for Fruit shall be 1.8",
-				"The base price of 1.8 for Fruit can be seen in program output data");
+			Requirement* ECON_140 = new Requirement(
+				"ECON_140", "The base price for Fruit shall be 1.8",
+				"The base price of 1.8 for Fruit can be seen in program output data"
+			);
 			add_requirement(ECON_140);
-			Requirement* ECON_141 = new Requirement("ECON_141",
-				"The base price for Fuel shall be 25",
-				"The base price of 25 for Fuel can be seen in program output data");
+			Requirement* ECON_141 = new Requirement(
+				"ECON_141", "The base price for Fuel shall be 25",
+				"The base price of 25 for Fuel can be seen in program output data"
+			);
 			add_requirement(ECON_141);
-			Requirement* ECON_142 = new Requirement("ECON_142",
-				"The base price for Furniture shall be 4.9",
-				"The base price of 4.9 for Furniture can be seen in program output data");
+			Requirement* ECON_142 = new Requirement(
+				"ECON_142", "The base price for Furniture shall be 4.9",
+				"The base price of 4.9 for Furniture can be seen in program output data"
+			);
 			add_requirement(ECON_142);
-			Requirement* ECON_234 = new Requirement("ECON_234",
-				"The base price for Glass shall be 2.9",
-				"The base price of 2.9 for Glass can be seen in program output data");
+			Requirement* ECON_234 = new Requirement(
+				"ECON_234", "The base price for Glass shall be 2.9",
+				"The base price of 2.9 for Glass can be seen in program output data"
+			);
 			add_requirement(ECON_234);
-			Requirement* ECON_235 = new Requirement("ECON_235",
-				"The base price for Grain shall be 2.2",
-				"The base price of 2.2 for Grain can be seen in program output data");
+			Requirement* ECON_235 = new Requirement(
+				"ECON_235", "The base price for Grain shall be 2.2",
+				"The base price of 2.2 for Grain can be seen in program output data"
+			);
 			add_requirement(ECON_235);
-			Requirement* ECON_236 = new Requirement("ECON_236",
-				"The base price for Iron shall be 3.5",
-				"The base price of 3.5 for Iron can be seen in program output data");
+			Requirement* ECON_236 = new Requirement(
+				"ECON_236", "The base price for Iron shall be 3.5",
+				"The base price of 3.5 for Iron can be seen in program output data"
+			);
 			add_requirement(ECON_236);
-			Requirement* ECON_237 = new Requirement("ECON_237",
-				"The base price for Liquor shall be 6.4",
-				"The base price of 6.4 for Liquor can be seen in program output data");
+			Requirement* ECON_237 = new Requirement(
+				"ECON_237", "The base price for Liquor shall be 6.4",
+				"The base price of 6.4 for Liquor can be seen in program output data"
+			);
 			add_requirement(ECON_237);
-			Requirement* ECON_238 = new Requirement("ECON_238",
-				"The base price for Lumber shall be 1",
-				"The base price of 1 for Lumber can be seen in program output data");
+			Requirement* ECON_238 = new Requirement(
+				"ECON_238", "The base price for Lumber shall be 1",
+				"The base price of 1 for Lumber can be seen in program output data"
+			);
 			add_requirement(ECON_238);
-			Requirement* ECON_239 = new Requirement("ECON_239",
-				"The base price for Luxury Clothes shall be 65",
-				"The base price of 65 for Luxury Clothes can be seen in program output data");
+			Requirement* ECON_239 = new Requirement(
+				"ECON_239", "The base price for Luxury Clothes shall be 65",
+				"The base price of 65 for Luxury Clothes can be seen in program output data"
+			);
 			add_requirement(ECON_239);
-			Requirement* ECON_240 = new Requirement("ECON_240",
-				"The base price for Luxury Furniture shall be 59",
-				"The base price of 59 for Luxury Furniture can be seen in program output data");
+			Requirement* ECON_240 = new Requirement(
+				"ECON_240", "The base price for Luxury Furniture shall be 59",
+				"The base price of 59 for Luxury Furniture can be seen in program output data"
+			);
 			add_requirement(ECON_240);
-			Requirement* ECON_241 = new Requirement("ECON_241",
-				"The base price for Machine Parts shall be 36.5",
-				"The base price of 36.5 for Machine Parts can be seen in program output data");
+			Requirement* ECON_241 = new Requirement(
+				"ECON_241", "The base price for Machine Parts shall be 36.5",
+				"The base price of 36.5 for Machine Parts can be seen in program output data"
+			);
 			add_requirement(ECON_241);
-			Requirement* ECON_242 = new Requirement("ECON_242",
-				"The base price for Oil shall be 12",
-				"The base price of 12 for Oil can be seen in program output data");
+			Requirement* ECON_242 = new Requirement(
+				"ECON_242", "The base price for Oil shall be 12",
+				"The base price of 12 for Oil can be seen in program output data"
+			);
 			add_requirement(ECON_242);
-			Requirement* ECON_243 = new Requirement("ECON_243",
-				"The base price for Opium shall be 3.2",
-				"The base price of 3.2 for Opium can be seen in program output data");
+			Requirement* ECON_243 = new Requirement(
+				"ECON_243", "The base price for Opium shall be 3.2",
+				"The base price of 3.2 for Opium can be seen in program output data"
+			);
 			add_requirement(ECON_243);
-			Requirement* ECON_244 = new Requirement("ECON_244",
-				"The base price for Paper shall be 3.4",
-				"The base price of 3.4 for Paper can be seen in program output data");
+			Requirement* ECON_244 = new Requirement(
+				"ECON_244", "The base price for Paper shall be 3.4",
+				"The base price of 3.4 for Paper can be seen in program output data"
+			);
 			add_requirement(ECON_244);
-			Requirement* ECON_245 = new Requirement("ECON_245",
-				"The base price for Precious Metal  shall be 8",
-				"The base price of 8 for Precious Metal can be seen in program output data");
+			Requirement* ECON_245 = new Requirement(
+				"ECON_245", "The base price for Precious Metal  shall be 8",
+				"The base price of 8 for Precious Metal can be seen in program output data"
+			);
 			add_requirement(ECON_245);
-			Requirement* ECON_246 = new Requirement("ECON_246",
-				"The base price for Radios shall be 16",
-				"The base price of 16 for Radios can be seen in program output data");
+			Requirement* ECON_246 = new Requirement(
+				"ECON_246", "The base price for Radios shall be 16",
+				"The base price of 16 for Radios can be seen in program output data"
+			);
 			add_requirement(ECON_246);
-			Requirement* ECON_247 = new Requirement("ECON_247",
-				"The base price for Regular Clothes shall be 5.8",
-				"The base price of 5.8 for Regular Clothes can be seen in program output data");
+			Requirement* ECON_247 = new Requirement(
+				"ECON_247", "The base price for Regular Clothes shall be 5.8",
+				"The base price of 5.8 for Regular Clothes can be seen in program output data"
+			);
 			add_requirement(ECON_247);
-			Requirement* ECON_248 = new Requirement("ECON_248",
-				"The base price for Rubber shall be 7",
-				"The base price of 7 for Rubber can be seen in program output data");
+			Requirement* ECON_248 = new Requirement(
+				"ECON_248", "The base price for Rubber shall be 7",
+				"The base price of 7 for Rubber can be seen in program output data"
+			);
 			add_requirement(ECON_248);
-			Requirement* ECON_249 = new Requirement("ECON_249",
-				"The base price for Silk shall be 10",
-				"The base price of 10 for Silk can be seen in program output data");
+			Requirement* ECON_249 = new Requirement(
+				"ECON_249", "The base price for Silk shall be 10",
+				"The base price of 10 for Silk can be seen in program output data"
+			);
 			add_requirement(ECON_249);
-			Requirement* ECON_250 = new Requirement("ECON_250",
-				"The base price for Small Arms shall be 37",
-				"The base price of 37 for Small Arms can be seen in program output data");
+			Requirement* ECON_250 = new Requirement(
+				"ECON_250", "The base price for Small Arms shall be 37",
+				"The base price of 37 for Small Arms can be seen in program output data"
+			);
 			add_requirement(ECON_250);
-			Requirement* ECON_251 = new Requirement("ECON_251",
-				"The base price for Steamer Convoys shall be 65",
-				"The base price of 65 for Steamer Convoys can be seen in program output data");
+			Requirement* ECON_251 = new Requirement(
+				"ECON_251", "The base price for Steamer Convoys shall be 65",
+				"The base price of 65 for Steamer Convoys can be seen in program output data"
+			);
 			add_requirement(ECON_251);
-			Requirement* ECON_252 = new Requirement("ECON_252",
-				"The base price for Steel shall be 4.7",
-				"The base price of 4.7 for Steel can be seen in program output data");
+			Requirement* ECON_252 = new Requirement(
+				"ECON_252", "The base price for Steel shall be 4.7",
+				"The base price of 4.7 for Steel can be seen in program output data"
+			);
 			add_requirement(ECON_252);
-			Requirement* ECON_253 = new Requirement("ECON_253",
-				"The base price for Sulphur shall be 6",
-				"The base price of 6 for Sulphur can be seen in program output data");
+			Requirement* ECON_253 = new Requirement(
+				"ECON_253", "The base price for Sulphur shall be 6",
+				"The base price of 6 for Sulphur can be seen in program output data"
+			);
 			add_requirement(ECON_253);
-			Requirement* ECON_254 = new Requirement("ECON_254",
-				"The base price for Tanks shall be 98",
-				"The base price of 98 for Tanks can be seen in program output data");
+			Requirement* ECON_254 = new Requirement(
+				"ECON_254", "The base price for Tanks shall be 98",
+				"The base price of 98 for Tanks can be seen in program output data"
+			);
 			add_requirement(ECON_254);
-			Requirement* ECON_255 = new Requirement("ECON_255",
-				"The base price for Tea shall be 2.6",
-				"The base price of 2.6 for Tea can be seen in program output data");
+			Requirement* ECON_255 = new Requirement(
+				"ECON_255", "The base price for Tea shall be 2.6",
+				"The base price of 2.6 for Tea can be seen in program output data"
+			);
 			add_requirement(ECON_255);
-			Requirement* ECON_256 = new Requirement("ECON_256",
-				"The base price for Telephones shall be 16",
-				"The base price of 16 for Telephones can be seen in program output data");
+			Requirement* ECON_256 = new Requirement(
+				"ECON_256", "The base price for Telephones shall be 16",
+				"The base price of 16 for Telephones can be seen in program output data"
+			);
 			add_requirement(ECON_256);
-			Requirement* ECON_257 = new Requirement("ECON_257",
-				"The base price for Timber shall be 0.9",
-				"The base price of 0.9 for Timber can be seen in program output data");
+			Requirement* ECON_257 = new Requirement(
+				"ECON_257", "The base price for Timber shall be 0.9",
+				"The base price of 0.9 for Timber can be seen in program output data"
+			);
 			add_requirement(ECON_257);
-			Requirement* ECON_258 = new Requirement("ECON_258",
-				"The base price for Tobacco shall be 1.1",
-				"The base price of 1.1 for Tobacco can be seen in program output data");
+			Requirement* ECON_258 = new Requirement(
+				"ECON_258", "The base price for Tobacco shall be 1.1",
+				"The base price of 1.1 for Tobacco can be seen in program output data"
+			);
 			add_requirement(ECON_258);
-			Requirement* ECON_259 = new Requirement("ECON_259",
-				"The base price for Tropical Wood shall be 5.4",
-				"The base price of 5.4 for Tropical Wood can be seen in program output data");
+			Requirement* ECON_259 = new Requirement(
+				"ECON_259", "The base price for Tropical Wood shall be 5.4",
+				"The base price of 5.4 for Tropical Wood can be seen in program output data"
+			);
 			add_requirement(ECON_259);
-			Requirement* ECON_260 = new Requirement("ECON_260",
-				"The base price for Wine shall be 9.7",
-				"The base price of 9.7 for Wine can be seen in program output data");
+			Requirement* ECON_260 = new Requirement(
+				"ECON_260", "The base price for Wine shall be 9.7",
+				"The base price of 9.7 for Wine can be seen in program output data"
+			);
 			add_requirement(ECON_260);
-			Requirement* ECON_261 = new Requirement("ECON_261",
-				"The base price for Wool shall be 0.7",
-				"The base price of 0.7 for Wool can be seen in program output data");
+			Requirement* ECON_261 = new Requirement(
+				"ECON_261", "The base price for Wool shall be 0.7",
+				"The base price of 0.7 for Wool can be seen in program output data"
+			);
 			add_requirement(ECON_261);
 		}
 
diff --git a/src/openvic-simulation/testing/test_scripts/A_003_military_unit_tests.cpp b/src/openvic-simulation/testing/test_scripts/A_003_military_unit_tests.cpp
index 7fd2184..cf572d0 100644
--- a/src/openvic-simulation/testing/test_scripts/A_003_military_unit_tests.cpp
+++ b/src/openvic-simulation/testing/test_scripts/A_003_military_unit_tests.cpp
@@ -1,5 +1,5 @@
-# include <testing/TestScript.hpp>
-# include <GameManager.hpp>
+#include "openvic-simulation/GameManager.hpp"
+#include "openvic-simulation/testing/TestScript.hpp"
 
 namespace OpenVic {
 	class A_003_military_unit_tests : public TestScript {
@@ -10,10 +10,8 @@ namespace OpenVic {
 			add_requirements();
 		}
 
-		void add_requirements() {
-		}
+		void add_requirements() {}
 
-		void execute_script() {
-		}
+		void execute_script() {}
 	};
 }
diff --git a/src/openvic-simulation/testing/test_scripts/A_004_networking_tests.cpp b/src/openvic-simulation/testing/test_scripts/A_004_networking_tests.cpp
index 5cdc86e..0e05540 100644
--- a/src/openvic-simulation/testing/test_scripts/A_004_networking_tests.cpp
+++ b/src/openvic-simulation/testing/test_scripts/A_004_networking_tests.cpp
@@ -1,5 +1,5 @@
-# include <testing/TestScript.hpp>
-# include <GameManager.hpp>
+#include "openvic-simulation/GameManager.hpp"
+#include "openvic-simulation/testing/TestScript.hpp"
 
 namespace OpenVic {
 	class A_004_networking_tests : public TestScript {
@@ -10,10 +10,8 @@ namespace OpenVic {
 			add_requirements();
 		}
 
-		void add_requirements() {
-		}
+		void add_requirements() {}
 
-		void execute_script() {
-		}
+		void execute_script() {}
 	};
 }
diff --git a/src/openvic-simulation/testing/test_scripts/A_005_nation_tests.cpp b/src/openvic-simulation/testing/test_scripts/A_005_nation_tests.cpp
index 494604f..6f91ac2 100644
--- a/src/openvic-simulation/testing/test_scripts/A_005_nation_tests.cpp
+++ b/src/openvic-simulation/testing/test_scripts/A_005_nation_tests.cpp
@@ -1,5 +1,5 @@
-# include <testing/TestScript.hpp>
-# include <GameManager.hpp>
+#include "openvic-simulation/GameManager.hpp"
+#include "openvic-simulation/testing/TestScript.hpp"
 
 namespace OpenVic {
 	class A_005_nation_tests : public TestScript {
@@ -10,10 +10,8 @@ namespace OpenVic {
 			add_requirements();
 		}
 
-		void add_requirements() {
-		}
+		void add_requirements() {}
 
-		void execute_script() {
-		}
+		void execute_script() {}
 	};
 }
diff --git a/src/openvic-simulation/testing/test_scripts/A_006_politics_tests.cpp b/src/openvic-simulation/testing/test_scripts/A_006_politics_tests.cpp
index 6fe9ca9..091075c 100644
--- a/src/openvic-simulation/testing/test_scripts/A_006_politics_tests.cpp
+++ b/src/openvic-simulation/testing/test_scripts/A_006_politics_tests.cpp
@@ -1,5 +1,5 @@
-# include <testing/TestScript.hpp>
-# include <GameManager.hpp>
+#include "openvic-simulation/GameManager.hpp"
+#include "openvic-simulation/testing/TestScript.hpp"
 
 namespace OpenVic {
 	class A_006_politics_tests : public TestScript {
@@ -10,10 +10,8 @@ namespace OpenVic {
 			add_requirements();
 		}
 
-		void add_requirements() {
-		}
+		void add_requirements() {}
 
-		void execute_script() {
-		}
+		void execute_script() {}
 	};
 }