Merge pull request #344 from folkarps/3.5.5-conflict-resolver

3.5.5 release (with conflicts resolved)
folkarps · Apr 27, 2021 · 6cfc36d · 6cfc36d
2 parents fa70671 + 6ab8ad0
commit 6cfc36d
Show file tree

Hide file tree

Showing 116 changed files with 1,795 additions and 8,322 deletions.
diff --git a/README.md b/README.md
@@ -10,7 +10,8 @@
   * Safe Start default set to 1 minute
   * Set AI Skill for all factions - Missionmakers can remove the cases they do not need
   * Pre-configured endings 1 -3 with generic titles and texts
+ * Numerous feature updates and improvements. See https://github.com/folkarps/F3 for update history.
 
 ## Versions ##
-* F3 3-5-4
-* ws_fnc 05/07/2015
+* F3 3-5-5
+* ws_fnc 05/07/2015 (with FA improvements)
diff --git a/description.ext b/description.ext
@@ -1,4 +1,4 @@
-fa3_version[] = {3,5,4}; // WARNING: DO NOT CHANGE THIS LINE
+fa3_version[] = {3,5,5}; // WARNING: DO NOT CHANGE THIS LINE
 
 // ============================================================================================
 // F3 - Loading Screen
@@ -132,7 +132,7 @@ class Params
 // ============================================================================================
 
 // F3 - Debug Mode
-// Credits: Please see the F3 online manual (http://www.ferstaberinde.com/f3/en/)
+// Credits and documentation: https://github.com/folkarps/F3/wiki
 // WARNING: DO NOT DISABLE THIS COMPONENT
 
     class f_param_debugMode
@@ -146,22 +146,23 @@ class Params
 // ============================================================================================
 
 // F3 - Folk Assign Gear Script
-// Credits: Please see the F3 online manual (http://www.ferstaberinde.com/f3/en/)
+// Credits and documentation: https://github.com/folkarps/F3/wiki
 
-    class f_param_loadouts
-    {
-            title = "$STR_f_param_loadouts";
-            values[] = {0,1};
-            texts[] = {"Light","Standard"};
-            default = 1;
-    };
+// To add an alternate loadout parameter, you must uncomment this block, uncomment the relevant block in a faction assignGear file, and add a new assignGear loadout file named according to that block.
+// You should also enable the rig selection block in assignGear_clothes.sqf
 
-// ============================================================================================
+//    class f_param_loadouts
+ //   {
+ //           title = "$STR_f_param_loadouts";
+//            values[] = {0,1};
+ //           texts[] = {"Light","Standard"};
+ //           default = 1;
+ //   };
 
 // ============================================================================================
 
 // F3 - Mission Timer/Safe Start
-// Credits: Please see the F2 online manual (http://www.ferstaberinde.com/f3/en/)
+// Credits and documentation: https://github.com/folkarps/F3/wiki
 
     class f_param_mission_timer
     {
@@ -174,7 +175,7 @@ class Params
 // ============================================================================================
 
 // F3 - Mission Conditions Selector
-// Credits: Please see the F3 online manual (http://www.ferstaberinde.com/f3/en/)
+// Credits and documentation: https://github.com/folkarps/F3/wiki
 
 	class f_param_weather
 	{
@@ -206,43 +207,41 @@ class Params
 		values[] = {0,1,2,3,4,5,6,7,8};
 		texts[] = {$STR_f_param_timeOfDay_Option0,$STR_f_param_timeOfDay_Option1,$STR_f_param_timeOfDay_Option2,$STR_f_param_timeOfDay_Option3,$STR_f_param_timeOfDay_Option4,$STR_f_param_timeOfDay_Option5,$STR_f_param_timeOfDay_Option6,$STR_f_param_timeOfDay_Option7,$STR_f_param_timeOfDay_Option8};
 		default = 8;
-		function = "f_fnc_setTime"; // This function is called to apply the values
- 		isGlobal = 0; // Execute this only on the server
 	};
 
 // ============================================================================================
 
 // F3 - AI Skill Selector
-// Credits: Please see the F3 online manual (http://www.ferstaberinde.com/f3/en/)
+// Credits and documentation: https://github.com/folkarps/F3/wiki
 
 	class f_param_AISkill_BLUFOR
 	{
 		title = "$STR_f_param_AISkill_BLUFOR";
 		values[] = {0,1,2,3};
 		texts[] = {$STR_f_param_AISkill_Option0,$STR_f_param_AISkill_Option1,$STR_f_param_AISkill_Option2,$STR_f_param_AISkill_Option3};
-		default = 1;
+		default = 2;
 	};
 
 	class f_param_AISkill_OPFOR
 	{
 		title = "$STR_f_param_AISkill_OPFOR";
 		values[] = {0,1,2,3};
 		texts[] = {$STR_f_param_AISkill_Option0,$STR_f_param_AISkill_Option1,$STR_f_param_AISkill_Option2,$STR_f_param_AISkill_Option3};
-		default = 1;
+		default = 2;
 	};
 
 	class f_param_AISkill_INDP
 	{
 		title = "$STR_f_param_AISkill_INDP";
 		values[] = {0,1,2,3};
 		texts[] = {$STR_f_param_AISkill_Option0,$STR_f_param_AISkill_Option1,$STR_f_param_AISkill_Option2,$STR_f_param_AISkill_Option3};
-		default = 1;
+		default = 2;
 	};
 
 // ============================================================================================
 
 // F3 - Caching
-// Credits: Please see the F3 online manual (http://www.ferstaberinde.com/f3/en/)
+// Credits and documentation: https://github.com/folkarps/F3/wiki
 
 //	class f_param_caching
 //	{
@@ -261,7 +260,7 @@ class Params
 // ============================================================================================
 
 // F3 - Briefing Template
-// Credits: BIS - Please see the F3 online manual (http://www.ferstaberinde.com/f3/en/)
+// Credits and documentation: https://github.com/folkarps/F3/wiki
 
 class CfgDebriefing
 {

diff --git a/f/EandEcheck/f_EandECheckLoop.sqf b/f/EandEcheck/f_EandECheckLoop.sqf
@@ -1,5 +1,5 @@
 // F3 - Group E&E Check
-// Credits: Please see the F3 online manual (http://www.ferstaberinde.com/f3/en/)
+// Credits and documentation: https://github.com/folkarps/F3/wiki
 // ====================================================================================
 
 // SERVER CHECK

diff --git a/f/FTMemberMarkers/f_localFTMemberMarker.sqf b/f/FTMemberMarkers/f_localFTMemberMarker.sqf
@@ -1,5 +1,5 @@
 // F3 - Fireteam Member Markers
-// Credits: Please see the F3 online manual (http://www.ferstaberinde.com/f3/en/)
+// Credits and documentation: https://github.com/folkarps/F3/wiki
 // ====================================================================================
 
 // DECLARE PRIVATE VARIABLES

diff --git a/f/FTMemberMarkers/fn_GetMarkerColor.sqf b/f/FTMemberMarkers/fn_GetMarkerColor.sqf
@@ -1,5 +1,5 @@
 // 	F3 - Convert teamcolors to markercolor.
-// 	Credits: Please see the F3 online manual (http://www.ferstaberinde.com/f3/en/)
+// Credits and documentation: https://github.com/folkarps/F3/wiki
 //  Description: Converts group team colors to Marker colors
 //  Parameters
 //		0: String (MAIN,RED,GREEN,BLUE,YELLOW)

diff --git a/f/FTMemberMarkers/fn_SetLocalFTMemberMarkers.sqf b/f/FTMemberMarkers/fn_SetLocalFTMemberMarkers.sqf
@@ -1,5 +1,5 @@
 // 	F3 - Fireteam Member Markers
-// 	Credits: Please see the F3 online manual (http://www.ferstaberinde.com/f3/en/)
+// Credits and documentation: https://github.com/folkarps/F3/wiki
 //  Description: Launches the main part of the FireTeam Member markers.
 //  Parameters
 //		Nothing.

diff --git a/f/assignGear/f_assignGear_3IFB.sqf b/f/assignGear/f_assignGear_3IFB.sqf
@@ -1,5 +1,5 @@
 // F3 - Folk ARPS Assign Gear Script - 3IFB
-// Credits: Please see the F3 online manual (http://www.ferstaberinde.com/f3/en/)
+// Credits and documentation: https://github.com/folkarps/F3/wiki
 // ====================================================================================
 
 // DEFINE EQUIPMENT TABLES
@@ -9,6 +9,7 @@
 //		co			- commander
 //		dc 			- deputy commander / squad leader
 //		m 			- medic
+//		cls			- combat life saver
 //		ftl			- fire team leader
 //		ar 			- automatic rifleman
 //		aar			- assistant automatic rifleman
@@ -34,6 +35,8 @@
 //		hsamag		- heavy SAM assistant gunner (deployable)
 //		sn			- sniper
 //		sp			- spotter (for sniper)
+//		lvc			- light vehicle crew
+//		lvd			- light vehicle driver (repair)
 //		vc			- vehicle commander
 //		vg			- vehicle gunner
 //		vd			- vehicle driver (repair)
@@ -68,10 +71,10 @@
 // GENERAL EQUIPMENT USED BY MULTIPLE CLASSES
 
 // ATTACHMENTS - PRIMARY
-_attach1 = "";	// IR Laser
+_attach1 = "acc_pointer_IR";	// IR Laser
 _attach2 = "acc_flashlight";	// Flashlight
 
-_silencer1 = "mmuzzle_snds_B";	// 7.62 suppressor
+_silencer1 = "muzzle_snds_B";	// 7.62 suppressor
 _silencer2 = "muzzle_snds_H";	// 6.5 suppressor
 
 _scope1 = "optic_ACO";			// ACO
@@ -164,7 +167,11 @@ _firstaid = "FirstAidKit";
 _medkit = "Medikit";
 
 // Night Vision Goggles
-//_nvg = "NVGoggles_OPFOR";
+_nvg = "NVGoggles_OPFOR";
+_nvgPilot = "NVGoggles_OPFOR"; // Integrated_NVG_F for fullscreen NV
+
+// Binoculars
+_binoculars = "Rangefinder";
 
 // Laserdesignator
 _laserdesignator = "Laserdesignator_03";
@@ -183,8 +190,8 @@ _bag = "B_FieldPack_khk";			// carries 160, weighs 20
 _baglarge =  "B_Carryall_khk"; 				// carries 320, weighs 60
 _bagdiver =  "B_AssaultPack_blk";		// used by divers
 _baguav = "I_UAV_01_backpack_F";			// used by UAV operator
-_baghmgg = "B_HMG_01_weapon_F";				// used by Heavy MG gunner
-_baghmgag = "B_HMG_01_support_F";			// used by Heavy MG assistant gunner
+_baghmgg = "I_G_HMG_02_weapon_F";				// used by Heavy MG gunner
+_baghmgag = "I_G_HMG_02_support_F";			// used by Heavy MG assistant gunner
 _baghatg = "B_AssaultPack_rgr";				// Used by Heavy AT Gunner
 _bagmtrg = "B_Mortar_01_weapon_F";			// used by Mortar gunner
 _bagmtrag = "B_Mortar_01_support_F";		// used by Mortar assistant gunner
@@ -254,6 +261,7 @@ _crew = ["vc","vg","vd"];
 _ghillie = ["sn","sp"];
 _specOp = [];
 _jet = ["jp"];
+_vip = [];
 
 // Basic clothing
 // The outfit-piece is randomly selected from the array for each unit
@@ -299,7 +307,7 @@ _crewRig = ["V_Chestrig_blk"];
 _crewGlasses = [];
 
 // Ghillie
-_ghillieUniform = ["U_B_GhillieSuit"];	//DLC alternatives: ["U_B_FullGhillie_lsh","U_B_FullGhillie_ard","U_B_FullGhillie_sard"];
+_ghillieUniform = ["U_B_T_Sniper_F"];	//DLC alternatives: ["U_B_FullGhillie_lsh","U_B_FullGhillie_ard","U_B_FullGhillie_sard"];
 _ghillieHelmet = [];
 _ghillieRig = ["V_Chestrig_rgr"];
 _ghillieGlasses = [];
@@ -310,6 +318,12 @@ _sfhelmet = _baseHelmet;
 _sfRig = _standardRig;
 _sfGlasses = [];
 
+// VIP/Officer
+_vipUniform = ["U_O_R_Gorka_01_black_F"];
+_vipHelmet = _baseHelmet;
+_vipRig = _standardRig;
+_vipGlasses = [];
+
 // ====================================================================================
 
 // This block needs only to be run on an infantry unit
@@ -335,7 +349,7 @@ if (_isMan) then {
 	// ADD UNIVERSAL ITEMS
 	// Add items universal to all units of this faction
 
-	_unit linkItem _nvg;			// Add and equip the faction's nvg
+	//	_unit linkItem _nvg;			// Add and equip the faction's nvg
 	_unit addItem _firstaid;		// Add a single first aid kit (FAK)
 	_unit linkItem "ItemMap";		// Add and equip the map
 	_unit linkItem "ItemCompass";	// Add and equip a compass
@@ -349,17 +363,18 @@ if (_isMan) then {
 
 // SELECT LOADOUT
 // Pick the appropriate loadout depending on the parameter
+// To use an alternate loadout parameter, you must uncomment this block, uncomment the relevant block in description.ext, and add an assignGear loadout file as named below.
 
-_loadout = f_param_loadouts;
+// _loadout = f_param_loadouts;
 
 // Light Loadout
-if (_loadout == 0) then {
-	#include "f_assignGear_3IFB_light.sqf"
-};
+// if (_loadout == 0) then {
+//	#include "f_assignGear_3IFB_light.sqf"
+// };
 
 // Standard Loadout
-if (_loadout == 1) then {
-	#include "f_assignGear_3IFB_standard.sqf"
-};
+// if (_loadout == 1) then {
+	#include "f_assignGear_3IFB_standard.sqf";
+// };
 
 // ====================================================================================