Merge pull request #67 from OpenVicProject/format

Formating

1 files changed, 87 insertions, 88 deletions

diff --git a/src/openvic-simulation/military/Unit.cpp b/src/openvic-simulation/military/Unit.cpp
index 294c77f..1b5f2d2 100644
--- a/src/openvic-simulation/military/Unit.cpp
+++ b/src/openvic-simulation/military/Unit.cpp
@@ -2,22 +2,24 @@
 
 #define UNIT_ARGS \
 	icon, sprite, active, unit_type, floating_flag, priority, max_strength, default_organisation, maximum_speed, \
-	weighted_value, move_sound, select_sound, build_time, std::move(build_cost), supply_consumption, std::move(supply_cost)
+	weighted_value, move_sound, select_sound, build_time, std::move(build_cost), supply_consumption, \
+	std::move(supply_cost)
 
 #define LAND_ARGS \
-	primary_culture, sprite_override, sprite_mount, sprite_mount_attach_node, \
-	reconnaissance, attack, defence, discipline, support, maneuver, siege
+	primary_culture, sprite_override, sprite_mount, sprite_mount_attach_node, reconnaissance, attack, defence, discipline, \
+	support, maneuver, siege
 
 #define NAVY_ARGS \
-	naval_icon, sail, transport, capital, colonial_points, build_overseas, min_port_level, \
-	limit_per_port, supply_consumption_score, hull, gun_power, fire_range, evasion, torpedo_attack
+	naval_icon, sail, transport, capital, colonial_points, build_overseas, min_port_level, limit_per_port, \
+	supply_consumption_score, hull, gun_power, fire_range, evasion, torpedo_attack
 
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;
 
-Unit::Unit(std::string_view identifier, type_t type, UNIT_PARAMS)
-	: HasIdentifier { identifier }, icon { icon }, type { type }, sprite { sprite }, active { active },
-	unit_type { unit_type }, floating_flag { floating_flag }, priority { priority }, max_strength { max_strength },
+Unit::Unit(
+	std::string_view identifier, type_t type, UNIT_PARAMS
+) : HasIdentifier { identifier }, icon { icon }, type { type }, sprite { sprite }, active { active }, unit_type { unit_type },
+	floating_flag { floating_flag }, priority { priority }, max_strength { max_strength },
 	default_organisation { default_organisation }, maximum_speed { maximum_speed }, weighted_value { weighted_value },
 	move_sound { move_sound }, select_sound { select_sound }, build_time { build_time }, build_cost { std::move(build_cost) },
 	supply_consumption { supply_consumption }, supply_cost { std::move(supply_cost) } {}
@@ -90,11 +92,12 @@ Good::good_map_t const& Unit::get_supply_cost() const {
 	return supply_cost;
 }
 
-LandUnit::LandUnit(std::string_view identifier, UNIT_PARAMS, LAND_PARAMS)
-	: Unit { identifier, type_t::LAND, UNIT_ARGS }, primary_culture { primary_culture },
-	sprite_override { sprite_override }, sprite_mount { sprite_mount }, sprite_mount_attach_node { sprite_mount_attach_node },
-	reconnaissance { reconnaissance }, attack { attack }, defence { defence }, discipline { discipline }, support { support },
-	maneuver { maneuver }, siege { siege } {}
+LandUnit::LandUnit(
+	std::string_view identifier, UNIT_PARAMS, LAND_PARAMS
+) : Unit { identifier, type_t::LAND, UNIT_ARGS }, primary_culture { primary_culture }, sprite_override { sprite_override },
+	sprite_mount { sprite_mount }, sprite_mount_attach_node { sprite_mount_attach_node }, reconnaissance { reconnaissance },
+	attack { attack }, defence { defence }, discipline { discipline }, support { support }, maneuver { maneuver },
+	siege { siege } {}
 
 bool LandUnit::get_primary_culture() const {
 	return primary_culture;
@@ -140,12 +143,13 @@ fixed_point_t LandUnit::get_siege() const {
 	return siege;
 }
 
-NavalUnit::NavalUnit(std::string_view identifier, UNIT_PARAMS, NAVY_PARAMS)
-	: Unit { identifier, type_t::NAVAL, UNIT_ARGS }, naval_icon { naval_icon }, sail { sail },
-	transport { transport }, capital { capital }, colonial_points { colonial_points },
-	build_overseas { build_overseas }, min_port_level { min_port_level },limit_per_port { limit_per_port },
-	supply_consumption_score { supply_consumption_score }, hull { hull }, gun_power { gun_power },
-	fire_range { fire_range }, evasion { evasion }, torpedo_attack { torpedo_attack } {};
+NavalUnit::NavalUnit(
+	std::string_view identifier, UNIT_PARAMS, NAVY_PARAMS
+) : Unit { identifier, type_t::NAVAL, UNIT_ARGS }, naval_icon { naval_icon }, sail { sail }, transport { transport },
+	capital { capital }, colonial_points { colonial_points }, build_overseas { build_overseas },
+	min_port_level { min_port_level }, limit_per_port { limit_per_port },
+	supply_consumption_score { supply_consumption_score }, hull { hull }, gun_power { gun_power }, fire_range { fire_range },
+	evasion { evasion }, torpedo_attack { torpedo_attack } {};
 
 NavalUnit::icon_t NavalUnit::get_naval_icon() const {
 	return naval_icon;
@@ -217,7 +221,7 @@ bool UnitManager::_check_shared_parameters(std::string_view identifier, UNIT_PAR
 		return false;
 	}
 
-	//TODO check that icon and sprite exist
+	// TODO check that icon and sprite exist
 
 	return true;
 }
@@ -235,7 +239,7 @@ bool UnitManager::add_naval_unit(std::string_view identifier, UNIT_PARAMS, NAVY_
 		return false;
 	}
 
-	//TODO: check that icon and sounds exist
+	// TODO: check that icon and sounds exist
 
 	return units.add_item(NavalUnit { identifier, UNIT_ARGS, NAVY_ARGS });
 }
@@ -248,13 +252,12 @@ bool UnitManager::load_unit_file(GoodManager const& good_manager, ast::NodeCPtr
 		bool active = true, floating_flag = false;
 		uint32_t priority = 0;
 		Timespan build_time;
-		fixed_point_t maximum_speed = 0, max_strength = 0, default_organisation = 0, weighted_value = 0, supply_consumption = 0;
+		fixed_point_t maximum_speed = 0, max_strength = 0, default_organisation = 0;
+		fixed_point_t weighted_value = 0, supply_consumption = 0;
 		Good::good_map_t build_cost, supply_cost;
 
 		using enum Unit::type_t;
-		static const string_map_t<Unit::type_t> type_map = {
-			{ "land", LAND }, { "naval", NAVAL }
-		};
+		static const string_map_t<Unit::type_t> type_map = { { "land", LAND }, { "naval", NAVAL } };
 		bool ret = expect_key("type", expect_identifier(expect_mapped_string(type_map, assign_variable_callback(type))))(value);
 
 		if (!ret) {
@@ -263,7 +266,7 @@ bool UnitManager::load_unit_file(GoodManager const& good_manager, ast::NodeCPtr
 		}
 
 		key_map_t key_map;
-		//shared
+		// shared
 		ret &= add_key_map_entries(key_map,
 			"icon", ONE_EXACTLY, expect_uint(assign_variable_callback(icon)),
 			"type", ONE_EXACTLY, success_callback,
@@ -285,68 +288,64 @@ bool UnitManager::load_unit_file(GoodManager const& good_manager, ast::NodeCPtr
 		);
 
 		switch (type) {
-		case LAND:
-			{
-				bool primary_culture = false;
-				std::string_view sprite_override, sprite_mount, sprite_mount_attach_node;
-				fixed_point_t reconnaissance = 0, attack = 0, defence = 0, discipline = 0, support = 0, maneuver = 0, siege = 0;
-
-				ret &= add_key_map_entries(key_map,
-					"primary_culture", ZERO_OR_ONE, expect_bool(assign_variable_callback(primary_culture)),
-					"sprite_override", ZERO_OR_ONE, expect_identifier(assign_variable_callback(sprite_override)),
-					"sprite_mount", ZERO_OR_ONE, expect_identifier(assign_variable_callback(sprite_mount)),
-					"sprite_mount_attach_node", ZERO_OR_ONE, expect_identifier(assign_variable_callback(sprite_mount_attach_node)),
-					"reconnaissance", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(reconnaissance)),
-					"attack", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(attack)),
-					"defence", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(defence)),
-					"discipline", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(discipline)),
-					"support", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(support)),
-					"maneuver", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(maneuver)),
-					"siege", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(siege))
-				);
-
-				ret &= expect_dictionary_key_map(key_map)(value);
-
-				ret &= add_land_unit(key, UNIT_ARGS, LAND_ARGS);
-
-				return ret;
-			}
-			break;
-		case NAVAL:
-			{
-				Unit::icon_t naval_icon = 0;
-				bool sail = false, transport = false, capital = false, build_overseas = false;
-				uint32_t min_port_level = 0;
-				int32_t limit_per_port = 0;
-				fixed_point_t fire_range = 0, evasion = 0, supply_consumption_score = 0, hull = 0, gun_power = 0, colonial_points = 0, torpedo_attack = 0;
-
-				ret &= add_key_map_entries(key_map,
-					"naval_icon", ONE_EXACTLY, expect_uint(assign_variable_callback(naval_icon)),
-					"sail", ZERO_OR_ONE, expect_bool(assign_variable_callback(sail)),
-					"transport", ZERO_OR_ONE, expect_bool(assign_variable_callback(transport)),
-					"capital", ZERO_OR_ONE, expect_bool(assign_variable_callback(capital)),
-					"colonial_points", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(colonial_points)),
-					"can_build_overseas", ZERO_OR_ONE, expect_bool(assign_variable_callback(build_overseas)),
-					"min_port_level", ONE_EXACTLY, expect_uint(assign_variable_callback(min_port_level)),
-					"limit_per_port", ONE_EXACTLY, expect_int(assign_variable_callback(limit_per_port)),
-					"supply_consumption_score", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(supply_consumption_score)),
-					"hull", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(hull)),
-					"gun_power", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(gun_power)),
-					"fire_range", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(fire_range)),
-					"evasion", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(evasion)),
-					"torpedo_attack", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(torpedo_attack))
-				);
-
-				ret &= expect_dictionary_key_map(key_map)(value);
-
-				ret &= add_naval_unit(key, UNIT_ARGS, NAVY_ARGS);
-
-				return ret;
-			}
-			break;
-		default:
-			Logger::error("Unknown unit type for ", key, ": ", static_cast<int>(type));
-			return false;
+		case LAND: {
+			bool primary_culture = false;
+			std::string_view sprite_override, sprite_mount, sprite_mount_attach_node;
+			fixed_point_t reconnaissance = 0, attack = 0, defence = 0, discipline = 0, support = 0, maneuver = 0, siege = 0;
+
+			ret &= add_key_map_entries(key_map,
+				"primary_culture", ZERO_OR_ONE, expect_bool(assign_variable_callback(primary_culture)),
+				"sprite_override", ZERO_OR_ONE, expect_identifier(assign_variable_callback(sprite_override)),
+				"sprite_mount", ZERO_OR_ONE, expect_identifier(assign_variable_callback(sprite_mount)),
+				"sprite_mount_attach_node", ZERO_OR_ONE, expect_identifier(assign_variable_callback(sprite_mount_attach_node)),
+				"reconnaissance", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(reconnaissance)),
+				"attack", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(attack)),
+				"defence", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(defence)),
+				"discipline", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(discipline)),
+				"support", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(support)),
+				"maneuver", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(maneuver)),
+				"siege", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(siege))
+			);
+
+			ret &= expect_dictionary_key_map(key_map)(value);
+
+			ret &= add_land_unit(key, UNIT_ARGS, LAND_ARGS);
+
+			return ret;
+		}
+		case NAVAL: {
+			Unit::icon_t naval_icon = 0;
+			bool sail = false, transport = false, capital = false, build_overseas = false;
+			uint32_t min_port_level = 0;
+			int32_t limit_per_port = 0;
+			fixed_point_t fire_range = 0, evasion = 0, supply_consumption_score = 0, hull = 0;
+			fixed_point_t gun_power = 0, colonial_points = 0, torpedo_attack = 0;
+
+			ret &= add_key_map_entries(key_map,
+				"naval_icon", ONE_EXACTLY, expect_uint(assign_variable_callback(naval_icon)),
+				"sail", ZERO_OR_ONE, expect_bool(assign_variable_callback(sail)),
+				"transport", ZERO_OR_ONE, expect_bool(assign_variable_callback(transport)),
+				"capital", ZERO_OR_ONE, expect_bool(assign_variable_callback(capital)),
+				"colonial_points", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(colonial_points)),
+				"can_build_overseas", ZERO_OR_ONE, expect_bool(assign_variable_callback(build_overseas)),
+				"min_port_level", ONE_EXACTLY, expect_uint(assign_variable_callback(min_port_level)),
+				"limit_per_port", ONE_EXACTLY, expect_int(assign_variable_callback(limit_per_port)),
+				"supply_consumption_score", ONE_EXACTLY,
+					expect_fixed_point(assign_variable_callback(supply_consumption_score)),
+				"hull", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(hull)),
+				"gun_power", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(gun_power)),
+				"fire_range", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(fire_range)),
+				"evasion", ONE_EXACTLY, expect_fixed_point(assign_variable_callback(evasion)),
+				"torpedo_attack", ZERO_OR_ONE, expect_fixed_point(assign_variable_callback(torpedo_attack))
+			);
+
+			ret &= expect_dictionary_key_map(key_map)(value);
+
+			ret &= add_naval_unit(key, UNIT_ARGS, NAVY_ARGS);
+
+			return ret;
+		}
+		default: Logger::error("Unknown unit type for ", key, ": ", static_cast<int>(type)); return false;
 		}
 	})(root);
 }