Merge pull request #393 from folkarps/dev

FA3.5.7 Release

README.md

@@ -9,9 +9,8 @@
   * Automatic Body Removal
   * 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-6
+* F3 3-5-7
 * ws_fnc 05/07/2015 (with FA improvements)

description.ext

@@ -1,4 +1,4 @@
-fa3_version[] = {3,5,6}; // WARNING: DO NOT CHANGE THIS LINE
+fa3_version[] = {3,5,7}; // WARNING: DO NOT CHANGE THIS LINE
 
 // ============================================================================================
 // F3 - Loading Screen
@@ -12,16 +12,16 @@ onLoadName = "*** Insert Mission Name Here. ***";
 
 //Corpses
 corpseManagerMode = 1; //0 = None, 1 = All, 2 = None_But_Respawned, 3 = All_But_Respawned
-corpseLimit = 30; // Corpse limit before which ( <= ) corpseRemovalMaxTime applies and after which ( > ) corpseRemovalMinTime applies. 
-corpseRemovalMinTime = 180; // Remove all bodies that have been dead longer than corpseRemovalMinTime when corpseLimit is breached. 
-corpseRemovalMaxTime = 600; // Maximum time a corpse can remain on the ground (if total number of corpses is equal or under corpseLimit). 
-minPlayerDistance = 500; // The minimum distance between corpse or wreck and nearest player before the corpse or wreck is allowed to be removed by the garbage collector. 
+corpseLimit = 30; // Corpse limit before which ( <= ) corpseRemovalMaxTime applies and after which ( > ) corpseRemovalMinTime applies.
+corpseRemovalMinTime = 180; // Remove all bodies that have been dead longer than corpseRemovalMinTime when corpseLimit is breached.
+corpseRemovalMaxTime = 600; // Maximum time a corpse can remain on the ground (if total number of corpses is equal or under corpseLimit).
+minPlayerDistance = 500; // The minimum distance between corpse or wreck and nearest player before the corpse or wreck is allowed to be removed by the garbage collector.
 
 //Wrecks
 //wreckManagerMode = 1; //0 = None, 1 = All, 2 = None_But_Respawned, 3 = All_But_Respawned
-//wreckLimit = 20; //Vehicle wreck limit before which ( <= ) wreckRemovalMaxTime applies and after which ( > ) wreckRemovalMinTime applies. 
-//wreckRemovalMinTime = 180; // Remove all wrecks that have existed longer than wreckRemovalMinTime when wreckLimit is breached. 
-//wreckRemovalMaxTime = 3600; // Maximum time a wreck can remain on the ground (if total number of wrecks is equal or under wreckLimit). 
+//wreckLimit = 20; //Vehicle wreck limit before which ( <= ) wreckRemovalMaxTime applies and after which ( > ) wreckRemovalMinTime applies.
+//wreckRemovalMinTime = 180; // Remove all wrecks that have existed longer than wreckRemovalMinTime when wreckLimit is breached.
+//wreckRemovalMaxTime = 3600; // Maximum time a wreck can remain on the ground (if total number of wrecks is equal or under wreckLimit).
 
 // ============================================================================================
 
@@ -123,6 +123,19 @@ class cfgNotifications
 
 // ============================================================================================
 
+// F3 - Custom sounds configuration
+
+class CfgSounds
+{
+	sounds[] = {};
+	#if __has_include("f\skulls\f_skullsSounds.hpp")
+		#include "f\skulls\f_skullsSounds.hpp"
+	#endif
+	// You can add custom sound classes after this line
+};
+
+// ============================================================================================
+
 // F3 - Start of Params code blocks.
 // WARNING: DO NOT DELETE OR COMMENT OUT THIS CODE BLOCK
 
@@ -180,9 +193,9 @@ class Params
 	class f_param_weather
 	{
 		title = "$STR_f_param_weather";
-		values[] = {0,1,2,3,4,5,6,7,8,9};
-		texts[] = {$STR_f_param_weather_Option0,$STR_f_param_weather_Option1,$STR_f_param_weather_Option2,$STR_f_param_weather_Option3,$STR_f_param_weather_Option4,$STR_f_param_weather_Option5,$STR_f_param_weather_Option6,$STR_f_param_weather_Option7,$STR_f_param_weather_Option8,$STR_f_param_weather_Option11};
-		default = 9;
+		values[] = {0,1,2,3,4,5,6,7,8,9,10,11};
+		texts[] = {$STR_f_param_weather_Option0,$STR_f_param_weather_Option1,$STR_f_param_weather_Option2,$STR_f_param_weather_Option3,$STR_f_param_weather_Option4,$STR_f_param_weather_Option5,$STR_f_param_weather_Option6,$STR_f_param_weather_Option7,$STR_f_param_weather_Option8,$STR_f_param_weather_Option9,$STR_f_param_weather_Option10,$STR_f_param_weather_Option11};
+		default = 11;
 	};
 
 	class f_param_fog
@@ -209,6 +222,14 @@ class Params
 		default = 8;
 	};
 
+	class f_param_timeOfYear
+	{
+		title = "$STR_f_param_timeOfYear";
+		values[] = {0,1,2,3,4};
+		texts[] = {$STR_f_param_timeOfYear_Option0,$STR_f_param_timeOfYear_Option1,$STR_f_param_timeOfYear_Option2,$STR_f_param_timeOfYear_Option3,$STR_f_param_timeOfYear_Option4};
+		default = 4;
+	};
+
 // ============================================================================================
 
 // F3 - AI Skill Selector
@@ -240,6 +261,19 @@ class Params
 
 // ============================================================================================
 
+// F3 - Special Effects Parameters
+// Credits and documentation: https://github.com/folkarps/F3/wiki
+
+	class f_param_gruntBirthdayParty
+	{
+		title = "Grunt Birthday Party";
+		values[] = {0,1,2};
+		texts[] = {"Off","Player deaths only","All"};
+		default = 0;
+	};
+
+// ============================================================================================
+
 // F3 - Caching
 // Credits and documentation: https://github.com/folkarps/F3/wiki
 

f/assignGear/f_assignGear_3IFB_standard.sqf

@@ -519,6 +519,8 @@ switch (_typeofUnit) do
 // Engineer (Demo) Loadout:
 	case "eng":
 	{
+		_unit setUnitTrait ["engineer",true]; // Can repair
+		_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
 		_unit addBackpack _bagLarge;
 		_unit addmagazines [_carbinemag, 1];
 		_unit addweapon _carbine;
@@ -534,6 +536,8 @@ switch (_typeofUnit) do
 // Engineer (Mines) Loadout:
 	case "engm":
 	{
+		_unit setUnitTrait ["engineer",true]; // Can repair
+		_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
 		_unit addBackpack _bagLarge;
 		_unit addmagazines [_carbinemag, 1];
 		_unit addweapon _carbine;

f/assignGear/f_assignGear_3IFB_v.sqf

@@ -7,7 +7,7 @@
 		clearMagazineCargoGlobal _unit;
 		clearItemCargoGlobal _unit;
 		clearBackpackCargoGlobal _unit;
-		_unit addWeaponCargoGlobal [_carbine, 2];
+		_unit addWeaponWithAttachmentsCargoGlobal [[_carbine,"","","",[_carbinemag,500],[],""],2];
 		_unit addMagazineCargoGlobal [_riflemag, 8];
 		_unit addMagazineCargoGlobal [_glriflemag, 8];
 		_unit addMagazineCargoGlobal [_carbinemag, 10];
@@ -28,7 +28,7 @@
 		clearMagazineCargoGlobal _unit;
 		clearItemCargoGlobal _unit;
 		clearBackpackCargoGlobal _unit;
-		_unit addWeaponCargoGlobal [_carbine, 4];
+		_unit addWeaponWithAttachmentsCargoGlobal [[_carbine,"","","",[_carbinemag,500],[],""],4];
 		_unit addMagazineCargoGlobal [_riflemag, 20];
 		_unit addMagazineCargoGlobal [_glriflemag, 20];
 		_unit addMagazineCargoGlobal [_carbinemag, 20];
@@ -51,7 +51,7 @@
 		clearMagazineCargoGlobal _unit;
 		clearItemCargoGlobal _unit;
 		clearBackpackCargoGlobal _unit;
-		_unit addWeaponCargoGlobal [_carbine, 2];
+		_unit addWeaponWithAttachmentsCargoGlobal [[_carbine,"","","",[_carbinemag,500],[],""],2];
 		_unit addMagazineCargoGlobal [_riflemag, 10];
 		_unit addMagazineCargoGlobal [_glriflemag, 10];
 		_unit addMagazineCargoGlobal [_carbinemag, 12];
@@ -97,7 +97,6 @@
 	    _unit addMagazineCargoGlobal [_smokegrenadegreen,2];
 	    _unit addMagazineCargoGlobal [_chemgreen,4];
 	    _unit addItemCargoGlobal [_firstaid,2];
-	    _unit addBackpackCargoGlobal ["B_Parachute",2];
 	    _unit addItemCargoGlobal ["Toolkit",1];
 	};
 
@@ -108,13 +107,12 @@
 		clearMagazineCargoGlobal _unit;
 		clearItemCargoGlobal _unit;
 		clearBackpackCargoGlobal _unit;
-	    _unit addWeaponCargoGlobal [_carbine,2];
-		_unit addWeaponCargoGlobal [_rat,1];
+		_unit addWeaponWithAttachmentsCargoGlobal [[_carbine,"","","",[_carbinemag,500],[],""],2];
+		_unit addWeaponWithAttachmentsCargoGlobal [[_rat,"","","",[_RATmag1,500],[],""],1];
 		_unit addMagazineCargoGlobal [_riflemag,10];
 		_unit addMagazineCargoGlobal [_glriflemag,10];
 		_unit addMagazineCargoGlobal [_carbinemag,10];
 		_unit addMagazineCargoGlobal [_armag,6];
-		_unit addMagazineCargoGlobal [_RATmag1,1];
 		_unit addMagazineCargoGlobal [_grenade,4];
 		_unit addmagazineCargoGlobal [_mgrenade,4];
 		_unit addMagazineCargoGlobal [_smokegrenade,8];
@@ -123,7 +121,6 @@
 		_unit addMagazineCargoGlobal [_chemgreen,4];
 		_unit addBackpackCargoGlobal [_bag,2];
 		_unit addItemCargoGlobal [_firstaid,4];
-		_unit addBackpackCargoGlobal ["B_Parachute",2];
 		_unit addItemCargoGlobal ["Toolkit",1];
 	};
 
@@ -134,13 +131,13 @@
 		clearMagazineCargoGlobal _unit;
 		clearItemCargoGlobal _unit;
 		clearBackpackCargoGlobal _unit;
-		_unit addWeaponCargoGlobal [_carbine,8];
-		_unit addWeaponCargoGlobal [_rat,2];
+		_unit addWeaponWithAttachmentsCargoGlobal [[_carbine,"","","",[_carbinemag,500],[],""],8];
+		_unit addWeaponWithAttachmentsCargoGlobal [[_rat,"","","",[_RATmag1,500],[],""],2];
 		_unit addMagazineCargoGlobal [_riflemag,20];
 		_unit addMagazineCargoGlobal [_glriflemag,20];
 		_unit addMagazineCargoGlobal [_carbinemag,20];
 		_unit addMagazineCargoGlobal [_armag,12];
-		_unit addMagazineCargoGlobal [_RATmag1,6];
+		_unit addMagazineCargoGlobal [_RATmag1,4];
 		_unit addMagazineCargoGlobal [_grenade,12];
 		_unit addmagazineCargoGlobal [_mgrenade,12];
 		_unit addMagazineCargoGlobal [_smokegrenade,12];
@@ -150,7 +147,6 @@
 		_unit addMagazineCargoGlobal [_chemgreen,4];
 		_unit addBackpackCargoGlobal [_bag,4];
 		_unit addItemCargoGlobal [_firstaid,6];
-		_unit addBackpackCargoGlobal ["B_Parachute",4];
 		_unit addItemCargoGlobal ["Toolkit",1];
 	};
 

f/assignGear/f_assignGear_AI.sqf

@@ -35,6 +35,7 @@ private _unitClasses = [
 	["_aar_"		,	"aar"	],
 	["_a_"			,	"aar"	],
 	["_lat_"		,	"rat"	],
+	["_lat2_"		,	"rat"	],
 	["_medic_"		,	"m"		],
 	["_gl_"			,	"gren"	],
 	["_exp_"		,	"eng"	],

f/assignGear/f_assignGear_aaf.sqf

@@ -198,7 +198,7 @@ _bagmtrg = "I_Mortar_01_weapon_F";			// used by Mortar gunner
 _bagmtrag = "I_Mortar_01_support_F";		// used by Mortar assistant gunner
 _baghsamg = "I_AA_01_weapon_F";				// used by Heavy SAM gunner
 _baghsamag = "I_HMG_01_support_F";			// used by Heavy SAM assistant gunner
-_bagRadio = "B_RadioBag_01_digi_F";	
+_bagRadio = "B_RadioBag_01_digi_F";			// cosmetic, used by COs, DCs, and anybody who might possibly use CC in session.
 
 // ====================================================================================
 

f/assignGear/f_assignGear_aaf_standard.sqf

@@ -520,6 +520,8 @@ switch (_typeofUnit) do
 // Engineer (Demo) Loadout:
 	case "eng":
 	{
+		_unit setUnitTrait ["engineer",true]; // Can repair
+		_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
 		_unit addBackpack _bagLarge;
 		_unit addmagazines [_carbinemag, 1];
 		_unit addweapon _carbine;
@@ -535,6 +537,8 @@ switch (_typeofUnit) do
 // Engineer (Mines) Loadout:
 	case "engm":
 	{
+		_unit setUnitTrait ["engineer",true]; // Can repair
+		_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
 		_unit addBackpack _bagLarge;
 		_unit addmagazines [_carbinemag, 1];
 		_unit addweapon _carbine;

f/assignGear/f_assignGear_aaf_v.sqf

@@ -7,7 +7,7 @@
 		clearMagazineCargoGlobal _unit;
 		clearItemCargoGlobal _unit;
 		clearBackpackCargoGlobal _unit;
-		_unit addWeaponCargoGlobal [_carbine, 2];
+		_unit addWeaponWithAttachmentsCargoGlobal [[_carbine,"","","",[_carbinemag,500],[],""],2];
 		_unit addMagazineCargoGlobal [_riflemag, 8];
 		_unit addMagazineCargoGlobal [_glriflemag, 8];
 		_unit addMagazineCargoGlobal [_carbinemag, 10];
@@ -28,7 +28,7 @@
 		clearMagazineCargoGlobal _unit;
 		clearItemCargoGlobal _unit;
 		clearBackpackCargoGlobal _unit;
-		_unit addWeaponCargoGlobal [_carbine, 4];
+		_unit addWeaponWithAttachmentsCargoGlobal [[_carbine,"","","",[_carbinemag,500],[],""],4];
 		_unit addMagazineCargoGlobal [_riflemag, 20];
 		_unit addMagazineCargoGlobal [_glriflemag, 20];
 		_unit addMagazineCargoGlobal [_carbinemag, 20];
@@ -51,7 +51,7 @@
 		clearMagazineCargoGlobal _unit;
 		clearItemCargoGlobal _unit;
 		clearBackpackCargoGlobal _unit;
-		_unit addWeaponCargoGlobal [_carbine, 2];
+		_unit addWeaponWithAttachmentsCargoGlobal [[_carbine,"","","",[_carbinemag,500],[],""],2];
 		_unit addMagazineCargoGlobal [_riflemag, 10];
 		_unit addMagazineCargoGlobal [_glriflemag, 10];
 		_unit addMagazineCargoGlobal [_carbinemag, 12];
@@ -97,7 +97,6 @@
 	    _unit addMagazineCargoGlobal [_smokegrenadegreen,2];
 	    _unit addMagazineCargoGlobal [_chemgreen,4];
 	    _unit addItemCargoGlobal [_firstaid,2];
-	    _unit addBackpackCargoGlobal ["B_Parachute",2];
 	    _unit addItemCargoGlobal ["Toolkit",1];
 	};
 
@@ -108,13 +107,12 @@
 		clearMagazineCargoGlobal _unit;
 		clearItemCargoGlobal _unit;
 		clearBackpackCargoGlobal _unit;
-	    _unit addWeaponCargoGlobal [_carbine,2];
-		_unit addWeaponCargoGlobal [_rat,1];
+	    _unit addWeaponWithAttachmentsCargoGlobal [[_carbine,"","","",[_carbinemag,500],[],""],2];
+		_unit addWeaponWithAttachmentsCargoGlobal [[_rat,"","","",[_RATmag1,500],[],""],1];
 		_unit addMagazineCargoGlobal [_riflemag,10];
 		_unit addMagazineCargoGlobal [_glriflemag,10];
 		_unit addMagazineCargoGlobal [_carbinemag,10];
 		_unit addMagazineCargoGlobal [_armag,6];
-		_unit addMagazineCargoGlobal [_RATmag1,1];
 		_unit addMagazineCargoGlobal [_grenade,4];
 		_unit addmagazineCargoGlobal [_mgrenade,4];
 		_unit addMagazineCargoGlobal [_smokegrenade,8];
@@ -123,7 +121,6 @@
 		_unit addMagazineCargoGlobal [_chemgreen,4];
 		_unit addBackpackCargoGlobal [_bag,2];
 		_unit addItemCargoGlobal [_firstaid,4];
-		_unit addBackpackCargoGlobal ["B_Parachute",2];
 		_unit addItemCargoGlobal ["Toolkit",1];
 	};
 
@@ -134,13 +131,13 @@
 		clearMagazineCargoGlobal _unit;
 		clearItemCargoGlobal _unit;
 		clearBackpackCargoGlobal _unit;
-		_unit addWeaponCargoGlobal [_carbine,8];
-		_unit addWeaponCargoGlobal [_rat,2];
+		_unit addWeaponWithAttachmentsCargoGlobal [[_carbine,"","","",[_carbinemag,500],[],""],8];
+		_unit addWeaponWithAttachmentsCargoGlobal [[_rat,"","","",[_RATmag1,500],[],""],2];
 		_unit addMagazineCargoGlobal [_riflemag,20];
 		_unit addMagazineCargoGlobal [_glriflemag,20];
 		_unit addMagazineCargoGlobal [_carbinemag,20];
 		_unit addMagazineCargoGlobal [_armag,12];
-		_unit addMagazineCargoGlobal [_RATmag1,6];
+		_unit addMagazineCargoGlobal [_RATmag1,4];
 		_unit addMagazineCargoGlobal [_grenade,12];
 		_unit addmagazineCargoGlobal [_mgrenade,12];
 		_unit addMagazineCargoGlobal [_smokegrenade,12];
@@ -150,7 +147,6 @@
 		_unit addMagazineCargoGlobal [_chemgreen,4];
 		_unit addBackpackCargoGlobal [_bag,4];
 		_unit addItemCargoGlobal [_firstaid,6];
-		_unit addBackpackCargoGlobal ["B_Parachute",4];
 		_unit addItemCargoGlobal ["Toolkit",1];
 	};
 

f/assignGear/f_assignGear_csatPacific.sqf

@@ -198,7 +198,7 @@ _bagmtrg = "O_Mortar_01_weapon_F";			// used by Mortar gunner
 _bagmtrag = "O_Mortar_01_support_F";		// used by Mortar assistant gunner
 _baghsamg = "O_AA_01_weapon_F";				// used by Heavy SAM gunner
 _baghsamag = "O_HMG_01_support_F";			// used by Heavy SAM assistant gunner
-_bagRadio = "B_RadioBag_01_ghex_F";	
+_bagRadio = "B_RadioBag_01_ghex_F";			// cosmetic, used by COs, DCs, and anybody who might possibly use CC in session.
 
 // ====================================================================================
 

f/assignGear/f_assignGear_csatPacific_standard.sqf

@@ -520,6 +520,8 @@ switch (_typeofUnit) do
 // Engineer (Demo) Loadout:
 	case "eng":
 	{
+		_unit setUnitTrait ["engineer",true]; // Can repair
+		_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
 		_unit addBackpack _bagLarge;
 		_unit addmagazines [_carbinemag, 1];
 		_unit addweapon _carbine;
@@ -535,6 +537,8 @@ switch (_typeofUnit) do
 // Engineer (Mines) Loadout:
 	case "engm":
 	{
+		_unit setUnitTrait ["engineer",true]; // Can repair
+		_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
 		_unit addBackpack _bagLarge;
 		_unit addmagazines [_carbinemag, 1];
 		_unit addweapon _carbine;

f/assignGear/f_assignGear_csat_standard.sqf

@@ -520,6 +520,8 @@ switch (_typeofUnit) do
 // Engineer (Demo) Loadout:
 	case "eng":
 	{
+		_unit setUnitTrait ["engineer",true]; // Can repair
+		_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
 		_unit addBackpack _bagLarge;
 		_unit addmagazines [_carbinemag, 1];
 		_unit addweapon _carbine;
@@ -535,6 +537,8 @@ switch (_typeofUnit) do
 // Engineer (Mines) Loadout:
 	case "engm":
 	{
+		_unit setUnitTrait ["engineer",true]; // Can repair
+		_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
 		_unit addBackpack _bagLarge;
 		_unit addmagazines [_carbinemag, 1];
 		_unit addweapon _carbine;