Merge pull request #400 from dijksterhuis/sites-rename-factory-map-ma…

…rkers

Sites: Change 'Factory' map marker name to 'Depot'.

mission/config/subconfigs/tasks/primary/tasks.hpp

@@ -1,9 +1,9 @@
 class capture_zone : task
 {
 	taskcategory = "PRI";
-	tasktitle = "Capture %1";
-	taskname = "Capture %1";
-	taskdesc = "Defeat hostile forces and sites in %1. Sites spawn inside the yellow circle.";
+	tasktitle = "Capture Zone";
+	taskname = "Capture Zone";
+	taskdesc = "Defeat hostile forces and sites the marked zone. Sites spawn inside the yellow circle.";
 	tasktype = "attack";
 	taskimage = "vn\missions_f_vietnam\data\img\mikeforce\p\vn_ui_mf_task_p1.jpg";
 	rankpoints = 30;
@@ -23,10 +23,12 @@ class capture_zone : task
 		taskdesc = "Destroy HQ supplies and the sites they're delivered to. You might find intel inside for the locations to the rest of the sites!";
 	};
 
+	// TODO: @dijksterhuis: All references to this need cleaning up at a later date to stop referring to the "Factory"
+	// https://github.com/Bro-Nation/Mike-Force/pull/400
 	class destroy_factory_sites
 	{
-		taskname = "Destroy Factory Supply Line";
-		taskdesc = "Destroy Factory supplies and the sites they're delivered to. You might find intel inside for the locations to the rest of the sites!";
+		taskname = "Destroy Depot Supply Line";
+		taskdesc = "Destroy Depot supplies and the sites they're delivered to. You might find intel inside for the locations to the rest of the sites!";
 	};
 
 	class build_fob
@@ -63,9 +65,9 @@ class capture_zone : task
 class prepare_zone : task
 {
 	taskcategory = "PRI";
-	tasktitle = "Prepare for %1";
-	taskname = "Prepare for %1";
-	taskdesc = "Get ready for %1!";
+	tasktitle = "Prepare for next zone";
+	taskname = "Prepare for next zone";
+	taskdesc = "Get ready for the next zone!";
 	tasktype = "repair";
 	taskimage = "vn\missions_f_vietnam\data\img\mikeforce\p\vn_ui_mf_task_p1.jpg";
 	rankpoints = 30;

mission/functions/systems/sites/create/compositions/fn_sites_create_compositions_factory.sqf

@@ -5,7 +5,10 @@
 	
 	Description:
 		Creates buildings for a PAVN Factory.
-	
+
+		TODO: @dijksterhuis: All references to factory need cleaning up at a later date
+		https://github.com/Bro-Nation/Mike-Force/pull/400
+
 	Parameter(s):
 		_position - Position [Position]
 	

mission/functions/systems/sites/create/site/fn_sites_create_site_factory.sqf

@@ -6,6 +6,9 @@
     Description:
 		Creates a new Factory site in the given location.
     
+		TODO: @dijksterhuis: All references to factory need cleaning up at a later date
+		https://github.com/Bro-Nation/Mike-Force/pull/400
+
     Parameter(s):
 		_pos - Position to spawn the HQ site at
     
@@ -103,7 +106,9 @@ params ["_pos"];
 		private _markerPos = _spawnPos getPos [20 + random 30, random 360];
 		private _factoryMarker = createMarker [format ["factory_%1", _siteId], _markerPos];
 		_factoryMarker setMarkerType "o_Ordnance";
-		_factoryMarker setMarkerText "Factory";
+		// NOTE: @dijskterhuis: Changed from "Factory"!
+		// TODO: Clean up factory usage across all sites code -- script filenames and variables etc.
+		_factoryMarker setMarkerText "Depot";
 		_factoryMarker setMarkerAlpha 0;
 
 		private _partialMarkerPos = _spawnPos getPos [10 + random 40, random 360];

mission/functions/tasks/primary/fn_task_pri_capture.sqf

@@ -85,9 +85,13 @@ _taskDataStore setVariable ["destroy_hq_sites", {
 	};
 }];
 
+// TODO: @dijksterhuis: All references to factory need cleaning up at a later date
+// https://github.com/Bro-Nation/Mike-Force/pull/400
 _taskDataStore setVariable ["destroy_factory_sites", {
 	params ["_taskDataStore"];
 
+	// TODO: @dijksterhuis: All references to factory need cleaning up at a later date
+	// https://github.com/Bro-Nation/Mike-Force/pull/400
 	private _side_sites_factory = missionNamespace getVariable ["side_sites_factory", []];
 
 	//check each site to see if it's destroyed