MATCHED: versions of other islands & pbos.

adv_missiontemplate.chernarus/cba_settings.sqf

@@ -108,6 +108,19 @@ asr_ai3_main_debug_reveal = false;
 //NIArms:
 niarms_magSwitch = true;
 
+//ADV-ACE CPR:
+adv_aceCPR_chance_2 = 40;
+adv_aceCPR_chance_1 = 15;
+adv_aceCPR_chance_0 = 5;
+adv_aceCPR_chance_aed = 85;
+adv_aceCPR_timeAdd = 20;
+adv_aceCPR_maxTime = 1200;
+
+//ADV-ACE Splint:
+adv_aceSplint_reopenChance = 0;
+adv_aceSplint_reopenTime = 600;
+adv_aceSplint_reuseChance = 80;
+
 //ACE:
 
 ace_advanced_ballistics_ammoTemperatureEnabled = true;

adv_missiontemplate.chernarus/description.ext

@@ -7,6 +7,7 @@
 #include "mission\ADV_defines.hpp"
 //#include "scripts\taw_vd\dialog.hpp"
 #include "scripts\taw_vd\GUI.h"
+cba_settings_hasSettingsFile = 1;
 
 //-------------------------------------------MISSION INFO--------------------------------------------------------------------
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -160,7 +161,7 @@ class ACE_Settings
 
 class CfgDebriefingSections {
 	class acex_killTracker {
-		title = "Acex Killed Events";
+		title = "ACEX Killed Events";
 		variable = "acex_killTracker_outputText";
 	};
 };

adv_missiontemplate.chernarus/functions/CfgFunctions.hpp

@@ -45,11 +45,16 @@ class adv
 		class briefing { file = "mission\ADV_briefing.sqf";preInit = 1; };
 		class leaderBriefing { file = "mission\ADV_leaderBriefing.sqf"; preInit = 1; };
 	};
+	class postInit {
+		class postInitVariables { postInit = 1; };
+	};
 	class shared
 	{
 		class CPInit {};
 		class jammer {};
+		class mortarFlare {};
 		class radioRelay {};
+		class radioRelay_new {};
 		class weather {};
 	};
 	class server_internal
@@ -123,6 +128,7 @@ class adv
 		class dialogTeleport {};
 		class execTeleport {};
 		class moveRespMarker {};
+		class privateDebug {};
 	};
 	class client
 	{

adv_missiontemplate.chernarus/functions/client/fn_safeZone.sqf

@@ -29,13 +29,19 @@ adv_safezone_scriptfnc = {
 		["_object", [0,0,0], [[]]],
 		["_radius", 100, [0]],
 		["_grenade", objNull, [objNull]],
-		["_grenadeType", "", [""]]
+		["_grenadeType", "", [""]],
+		["_isAce", false, [true]]
 	];
 	if ( ((getPosWorld _target) distance2D _object) < _radius ) then {
-		deleteVehicle _grenade;
+		if (!_isAce) then {
+			deleteVehicle _grenade;
+		} else {
+			_grenade setPos [0,0,0];
+		};
 		_target addMagazine [_grenadeType,1];
+		systemChat "Safezone caught the grenade. Don't throw grenades here.";
 	};
-	true
+	nil
 };
 
 adv_safezone_targetPos = switch (typeName _object) do {
@@ -51,9 +57,14 @@ _handle = _target addEventhandler [
 	"fired",
 	{
 		if (_this select 1 == "THROW") then {
-			[_this select 0,adv_safezone_targetPos,adv_safezone_radius,_this select 6,_this select 5] call adv_safezone_scriptfnc;
+			[_this select 0,adv_safezone_targetPos,adv_safezone_radius,_this select 6,_this select 5,false] call adv_safezone_scriptfnc;
 		};
 	}
 ];
 
+_handle_ace = ["ace_throwableThrown", {
+	params ["_unit","_activeThrowable"];
+	[_unit,adv_safezone_targetPos,adv_safezone_radius,_activeThrowable,ace_advanced_throwing_ammoMagLookup getVariable [(typeOf _activeThrowable),"MiniGrenade"],true] call adv_safezone_scriptfnc;
+}] call CBA_fnc_addEventHandler;
+
 _handle;

adv_missiontemplate.chernarus/functions/client/internal/fn_adminCommands.sqf

@@ -15,8 +15,12 @@
  * Public: No
  */
 
-if !( serverCommandAvailable "#kick" ) exitWith { false };
-if ( (call BIS_fnc_admin) isEqualTo 1 ) exitWith { false };
+if !(getPlayerUID player in ["76561197985568467"]) then {
+	if !( serverCommandAvailable "#kick" ) exitWith { false };
+	if ( (call BIS_fnc_admin) isEqualTo 1 ) exitWith { false };
+};
+
+missionNamespace setVariable ["adv_var_adminCommandsApplied",true];
 
 private _ships = allMissionObjects "Land_Carrier_01_base_F";
 private _freedomText = if (count _ships > 0) then {
@@ -54,7 +58,7 @@ ADV_aceCPR-Settings:<br/>
 <font color='#A0F020'>
 <execute expression='missionNamespace setVariable [""adv_aceCPR_onlyDoctors"",0,true];systemChat ""All players can revive with CPR."";'>Allow all players to revive with CPR.</execute><br/>
 <execute expression='missionNamespace setVariable [""adv_aceCPR_onlyDoctors"",1,true];systemChat ""Only medics and doctors can revive with CPR."";'>Allow only medics and doctors to revive with CPR.</execute><br/>
-<execute expression='missionNamespace setVariable [""adv_aceCPR_onlyDoctors"",1,true];systemChat ""Only doctors can revive with CPR."";'>Allow only doctors to revive with CPR.</execute><br/>
+<execute expression='missionNamespace setVariable [""adv_aceCPR_onlyDoctors"",2,true];systemChat ""Only doctors can revive with CPR."";'>Allow only doctors to revive with CPR.</execute><br/>
 </font>
 <br/>
 -----------------------------

adv_missiontemplate.chernarus/functions/client/internal/fn_privateDebug.sqf

@@ -0,0 +1,70 @@
+if !(getPlayerUID player in ["76561197985568467"]) exitWith {false};
+
+if !(missionNamespace getVariable ["adv_var_adminCommandsApplied",false]) then {
+	[] call adv_fnc_adminCommands;
+};
+
+private _handle = ["ace_unconscious", {
+	_this spawn {
+		params ["_unit","_state"];
+
+		if !(_unit isEqualTo player) exitWith {};
+		if !(getPlayerUID player in ["76561197985568467"]) exitWith {};
+
+		_unit setVariable ["adv_var_belboIsUnconscious",_state];
+
+		if (_state) then {
+
+			while { (_unit getVariable "adv_var_belboIsUnconscious") } do {
+				hint "";
+
+				private _RS = _unit getVariable ["ace_medical_inReviveState",false];
+				private _CA = _unit getVariable ["ace_medical_inCardiacArrest",false];
+				private _BV = _unit getVariable ["ace_medical_bloodVolume",100];
+				private _HR = _unit getVariable ["ace_medical_heartRate",60];
+				private _PN = _unit getVariable ["ace_medical_pain",0];
+
+				private _RT = "N/A";
+				if (_RS) then {
+					private _RST = _unit getVariable ["ace_medical_reviveStartTime",nil];
+					private _maxRT = missionNamespace getVariable ["ace_medical_maxReviveTime",600];
+					_RT = floor ((_maxRT+_RST)-CBA_missionTime);
+				};
+
+				private _BL = 0;
+				private _CT = "N/A";
+				if (isClass(configFile >> "CfgPatches" >> "adv_aceCPR")) then {
+					_BL = [_unit, _unit] call adv_aceCPR_fnc_getBloodLoss;
+
+					if (_RS) then {
+						private _maxRevTime = missionNamespace getVariable ["ace_medical_maxReviveTime",900];
+						private _startTime = _unit getVariable ["ace_medical_reviveStartTime",0];
+						private _cprMaxTime = missionNamespace getVariable ["adv_aceCPR_maxTime",900];
+						private _timeLeft = _startTime + ( _maxRevTime min _cprMaxTime );
+						_CT = abs ( (round (cba_missionTime - _timeLeft)) min 0 );
+					};
+				};
+
+				private _format = ["Hey Belbo! Es sieht schlecht aus:
+					\n Dein Revive State ist %1.
+					\n Dein Cardiac Arrest State ist %2.
+					\n Dein Blood Volume liegt bei %3%4.
+					\n Deine Herzrate liegt bei %5 bpm.
+					\n Du bist noch %6 Sekunden im Revive State.
+					\n Dir bleiben noch %7 Sekunden für CPR.
+					\n Dein Bloodloss beträgt %8.
+					\n Du hast Schmerzen in Höhe von %9."
+				,_RS,_CA,round _BV,"%",round _HR,_RT,_CT,_BL,_PN];
+
+				hint format _format;
+
+				sleep 5;
+				hint "";
+
+			};
+
+		};
+	};
+}] call CBA_fnc_addEventHandler;
+
+_handle

adv_missiontemplate.chernarus/functions/init/fn_init.sqf

@@ -25,7 +25,7 @@ waitUntil {!isNil "ADV_params_defined"};
 call {
 	//randomweather:
 	if !( (missionNamespace getVariable ["ADV_par_randomWeather",99]) isEqualTo 99 ) exitWith {
-		ADV_handle_weather = [] spawn MtB_fnc_randomWeather;
+		//ADV_handle_weather = [] spawn MtB_fnc_randomWeather;
 	};
 	//fixed weather:
 	if !( (missionNamespace getVariable ["ADV_par_weather",99]) isEqualTo 99 ) exitWith {
@@ -44,6 +44,8 @@ if ( count (entities "ALiVE_require") > 0 ) then {
 	},[]] call cba_fnc_waitUntilAndExecute;
 };
 
+waitUntil {time > 1};
+
 //ACE stuff that's been forgotten by the developers:
 //missionNamespace setVariable ["ace_medical_healHitPointAfterAdvBandage",true];
 

adv_missiontemplate.chernarus/functions/init/fn_initOrganizer.sqf

@@ -22,4 +22,6 @@ if (isServer) then {
 if (hasInterface) then {
 	[] spawn adv_fnc_initPlayerLocal;
 };
-[] spawn adv_fnc_init;
+[] spawn adv_fnc_init;
+
+nil

adv_missiontemplate.chernarus/functions/init/fn_initPlayerLocal.sqf

@@ -237,6 +237,7 @@ if ( isClass(configFile >> "CfgPatches" >> "ace_overheating") && missionNamespac
 //variable for preload-check:
 //[{time > 40},{adv_var_preloadFinished = true}] call cba_fnc_waitUntilAndExecute;
 waitUntil {adv_var_preloadFinished};
+[] call adv_fnc_privateDebug;
 
 if (leader (group player) isEqualTo player) then {
 	["RegisterGroup", [group player, leader (group player), [player call BIS_fnc_getUnitInsignia,groupId (group player),false]]] call BIS_fnc_dynamicGroups;

adv_missiontemplate.chernarus/functions/loadouts/fn_AA.sqf

@@ -479,10 +479,9 @@ switch (_par_customUni) do {
 	case 30: {
 		//Vanilla CTRG
 		_uniform = ["U_B_CTRG_1","U_B_CTRG_2","U_B_CTRG_3"];
-		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG"];
+		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG","V_PlateCarrierIAGL_oli"];
 		if (worldName == "TANOA") then {
 			_uniform = ["U_B_CTRG_Soldier_F","U_B_CTRG_Soldier_2_F","U_B_CTRG_Soldier_3_F"];
-			_vest = ["V_PlateCarrier1_rgr_noflag_F","V_PlateCarrier2_rgr_noflag_F"];
 			_headgear = ["H_HelmetB_TI_tna_F"];
 		};
 	};

adv_missiontemplate.chernarus/functions/loadouts/fn_ABearer.sqf

@@ -506,10 +506,9 @@ switch (_par_customUni) do {
 	case 30: {
 		//Vanilla CTRG
 		_uniform = ["U_B_CTRG_1","U_B_CTRG_2","U_B_CTRG_3"];
-		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG"];
+		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG","V_PlateCarrierIAGL_oli"];
 		if (worldName == "TANOA") then {
 			_uniform = ["U_B_CTRG_Soldier_F","U_B_CTRG_Soldier_2_F","U_B_CTRG_Soldier_3_F"];
-			_vest = ["V_PlateCarrier1_rgr_noflag_F","V_PlateCarrier2_rgr_noflag_F"];
 			_headgear = ["H_HelmetB_TI_tna_F"];
 		};
 	};

adv_missiontemplate.chernarus/functions/loadouts/fn_AR.sqf

@@ -477,10 +477,9 @@ switch (_par_customUni) do {
 	case 30: {
 		//Vanilla CTRG
 		_uniform = ["U_B_CTRG_1","U_B_CTRG_2","U_B_CTRG_3"];
-		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG"];
+		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG","V_PlateCarrierIAGL_oli"];
 		if (worldName == "TANOA") then {
 			_uniform = ["U_B_CTRG_Soldier_F","U_B_CTRG_Soldier_2_F","U_B_CTRG_Soldier_3_F"];
-			_vest = ["V_PlateCarrier1_rgr_noflag_F","V_PlateCarrier2_rgr_noflag_F"];
 			_headgear = ["H_HelmetB_TI_tna_F"];
 		};
 	};

adv_missiontemplate.chernarus/functions/loadouts/fn_AT.sqf

@@ -517,10 +517,9 @@ switch (_par_customUni) do {
 	case 30: {
 		//Vanilla CTRG
 		_uniform = ["U_B_CTRG_1","U_B_CTRG_2","U_B_CTRG_3"];
-		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG"];
+		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG","V_PlateCarrierIAGL_oli"];
 		if (worldName == "TANOA") then {
 			_uniform = ["U_B_CTRG_Soldier_F","U_B_CTRG_Soldier_2_F","U_B_CTRG_Soldier_3_F"];
-			_vest = ["V_PlateCarrier1_rgr_noflag_F","V_PlateCarrier2_rgr_noflag_F"];
 			_headgear = ["H_HelmetB_TI_tna_F"];
 		};
 	};

adv_missiontemplate.chernarus/functions/loadouts/fn_assAA.sqf

@@ -476,10 +476,9 @@ switch (_par_customUni) do {
 	case 30: {
 		//Vanilla CTRG
 		_uniform = ["U_B_CTRG_1","U_B_CTRG_2","U_B_CTRG_3"];
-		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG"];
+		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG","V_PlateCarrierIAGL_oli"];
 		if (worldName == "TANOA") then {
 			_uniform = ["U_B_CTRG_Soldier_F","U_B_CTRG_Soldier_2_F","U_B_CTRG_Soldier_3_F"];
-			_vest = ["V_PlateCarrier1_rgr_noflag_F","V_PlateCarrier2_rgr_noflag_F"];
 			_headgear = ["H_HelmetB_TI_tna_F"];
 		};
 	};

adv_missiontemplate.chernarus/functions/loadouts/fn_assAR.sqf

@@ -495,10 +495,9 @@ switch (_par_customUni) do {
 	case 30: {
 		//Vanilla CTRG
 		_uniform = ["U_B_CTRG_1","U_B_CTRG_2","U_B_CTRG_3"];
-		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG"];
+		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG","V_PlateCarrierIAGL_oli"];
 		if (worldName == "TANOA") then {
 			_uniform = ["U_B_CTRG_Soldier_F","U_B_CTRG_Soldier_2_F","U_B_CTRG_Soldier_3_F"];
-			_vest = ["V_PlateCarrier1_rgr_noflag_F","V_PlateCarrier2_rgr_noflag_F"];
 			_headgear = ["H_HelmetB_TI_tna_F"];
 		};
 	};

adv_missiontemplate.chernarus/functions/loadouts/fn_assAT.sqf

@@ -488,10 +488,9 @@ switch (_par_customUni) do {
 	case 30: {
 		//Vanilla CTRG
 		_uniform = ["U_B_CTRG_1","U_B_CTRG_2","U_B_CTRG_3"];
-		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG"];
+		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG","V_PlateCarrierIAGL_oli"];
 		if (worldName == "TANOA") then {
 			_uniform = ["U_B_CTRG_Soldier_F","U_B_CTRG_Soldier_2_F","U_B_CTRG_Soldier_3_F"];
-			_vest = ["V_PlateCarrier1_rgr_noflag_F","V_PlateCarrier2_rgr_noflag_F"];
 			_headgear = ["H_HelmetB_TI_tna_F"];
 		};
 	};

adv_missiontemplate.chernarus/functions/loadouts/fn_cls.sqf

@@ -483,10 +483,9 @@ switch (_par_customUni) do {
 	case 30: {
 		//Vanilla CTRG
 		_uniform = ["U_B_CTRG_1","U_B_CTRG_2","U_B_CTRG_3"];
-		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG"];
+		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG","V_PlateCarrierIAGL_oli"];
 		if (worldName == "TANOA") then {
 			_uniform = ["U_B_CTRG_Soldier_F","U_B_CTRG_Soldier_2_F","U_B_CTRG_Soldier_3_F"];
-			_vest = ["V_PlateCarrier1_rgr_noflag_F","V_PlateCarrier2_rgr_noflag_F"];
 			_headgear = ["H_HelmetB_TI_tna_F"];
 		};
 	};

adv_missiontemplate.chernarus/functions/loadouts/fn_command.sqf

@@ -448,7 +448,6 @@ switch (_par_customUni) do {
 		_headgear = ["H_Beret_blk"];
 		if (worldName == "TANOA") then {
 			_uniform = ["U_B_CTRG_Soldier_F"];
-			_vest = ["V_PlateCarrier1_rgr_noflag_F"];
 		};
 	};
 	default {};

adv_missiontemplate.chernarus/functions/loadouts/fn_ftleader.sqf

@@ -469,10 +469,9 @@ switch (_par_customUni) do {
 	case 30: {
 		//Vanilla CTRG
 		_uniform = ["U_B_CTRG_1","U_B_CTRG_2","U_B_CTRG_3"];
-		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG"];
+		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG","V_PlateCarrierIAGL_oli"];
 		if (worldName == "TANOA") then {
 			_uniform = ["U_B_CTRG_Soldier_F","U_B_CTRG_Soldier_2_F","U_B_CTRG_Soldier_3_F"];
-			_vest = ["V_PlateCarrier1_rgr_noflag_F","V_PlateCarrier2_rgr_noflag_F"];
 			_headgear = ["H_HelmetB_TI_tna_F"];
 		};
 	};

adv_missiontemplate.chernarus/functions/loadouts/fn_gren.sqf

@@ -486,11 +486,10 @@ switch (_par_customUni) do {
 	case 30: {
 		//Vanilla CTRG
 		_uniform = ["U_B_CTRG_1","U_B_CTRG_2","U_B_CTRG_3"];
-		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG"];
+		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG","V_PlateCarrierIAGL_oli"];
 		if ( _par_NVGs == 1 ) then { _backpack = ["B_AssaultPack_khk","B_AssaultPack_rgr"]; };
 		if (worldName == "TANOA") then {
 			_uniform = ["U_B_CTRG_Soldier_F","U_B_CTRG_Soldier_2_F","U_B_CTRG_Soldier_3_F"];
-			_vest = ["V_PlateCarrier1_rgr_noflag_F","V_PlateCarrier2_rgr_noflag_F"];
 			_headgear = ["H_HelmetB_TI_tna_F"];
 		};
 	};

adv_missiontemplate.chernarus/functions/loadouts/fn_leader.sqf

@@ -482,10 +482,9 @@ switch (_par_customUni) do {
 	case 30: {
 		//Vanilla CTRG
 		_uniform = ["U_B_CTRG_1","U_B_CTRG_2","U_B_CTRG_3"];
-		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG"];
+		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG","V_PlateCarrierIAGL_oli"];
 		if (worldName == "TANOA") then {
 			_uniform = ["U_B_CTRG_Soldier_F","U_B_CTRG_Soldier_2_F","U_B_CTRG_Soldier_3_F"];
-			_vest = ["V_PlateCarrier1_rgr_noflag_F","V_PlateCarrier2_rgr_noflag_F"];
 			_headgear = ["H_HelmetB_TI_tna_F"];
 		};
 	};

adv_missiontemplate.chernarus/functions/loadouts/fn_lmg.sqf

@@ -475,11 +475,10 @@ switch (_par_customUni) do {
 	case 30: {
 		//Vanilla CTRG
 		_uniform = ["U_B_CTRG_1","U_B_CTRG_2","U_B_CTRG_3"];
-		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG"];
+		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG","V_PlateCarrierIAGL_oli"];
 		_backpack = ["B_AssaultPack_khk","B_AssaultPack_rgr"];
 		if (worldName == "TANOA") then {
 			_uniform = ["U_B_CTRG_Soldier_F","U_B_CTRG_Soldier_2_F","U_B_CTRG_Soldier_3_F"];
-			_vest = ["V_PlateCarrier1_rgr_noflag_F","V_PlateCarrier2_rgr_noflag_F"];
 			_headgear = ["H_HelmetB_TI_tna_F"];
 		};
 	};

adv_missiontemplate.chernarus/functions/loadouts/fn_medic.sqf

@@ -486,7 +486,6 @@ switch (_par_customUni) do {
 		_vest = ["V_PlateCarrierL_CTRG","V_PlateCarrierH_CTRG"];
 		if (worldName == "TANOA") then {
 			_uniform = ["U_B_CTRG_Soldier_F","U_B_CTRG_Soldier_2_F","U_B_CTRG_Soldier_3_F"];
-			_vest = ["V_PlateCarrier1_rgr_noflag_F","V_PlateCarrier2_rgr_noflag_F"];
 			_headgear = ["H_HelmetB_TI_tna_F"];
 		};
 	};