Merge pull request #163 from ultranoobian/master

v0.5.3 Release Candidate

Author: ultranoobian

source/INIT.sqf

@@ -18,21 +18,26 @@ execvm "dynamic_music\dyn_music_init.sqf";
 if (hasInterface) then { execVM "misc\gps_marker.sqf";};
 if (!isMultiplayer) then {
 	getsize_script = [player] execVM "mapsize.sqf";
-};	
-	
+};
+staminaEnabled = ["Stamina", false] call BIS_fnc_getParamValue;
+if(staminaEnabled == 0) then {
+    staminaEnabled = false;
+} else {
+    staminaEnabled = true;
+};
 // IF MP
 if (isMultiplayer) then {
 
 	// Get the variables from the parameters lobby
 	_revive_activated = ["Revive", 1] call BIS_fnc_getParamValue;
 	DUWSMP_CP_death_cost = ["DeathPenalty", 1] call BIS_fnc_getParamValue;
-    staminaEnabled = ["Stamina", 0] call BIS_fnc_getParamValue;
+    //staminaEnabled = ["Stamina", 0] call BIS_fnc_getParamValue;
 
-    if(staminaEnabled == 0) then {
+    /*if(staminaEnabled == 0) then {
         staminaEnabled = false;
     } else {
         staminaEnabled = true;
-    };
+    };*/
 
     if (support_armory_available) then {
         hq_blu1 addaction ["<t color='#ff0066'>Armory (VA)</t>","bisArsenal.sqf", "", 0, true, true, "", "_this == player"];
@@ -42,10 +47,23 @@ if (isMultiplayer) then {
     };
 
 	if (_revive_activated == 1) then {execVM "duws_revive\reviveInit.sqf"};
+    
 	PlayerKilledEH = player addEventHandler ["killed", {
         commandpointsblu1 = commandpointsblu1 - DUWSMP_CP_death_cost;
         publicVariable "commandpointsblu1";
     }];
+    
+    PlayerBetrayerEH = player addEventHandler ["HandleRating", {
+        // If playerRating is negative (traitor) then reset to zero
+        _playerRating = rating (_this select 0);
+        if (_playerRating < 0) then {
+            player addRating (0 - _playerRating);
+        };
+        // If final rating is positive, do not modify, else zero.
+        _rating = _this select 1;
+        [0,_rating] select ((_playerRating - _rating) > 0);    
+    }];
+    
 	"support_specialized_training_available" addPublicVariableEventHandler {lbSetColor [2103, 11, [0, 1, 0, 1]];};
     "support_armory_available" addPublicVariableEventHandler {
         hq_blu1 addaction ["<t color='#ff0066'>Armory (VA)</t>","bisArsenal.sqf", "", 0, true, true, "", "_this == player"];

source/dialog/hc_init.sqf

@@ -1,12 +1,12 @@
-// _center = createCenter sideLogic;   un center existe déjŕ
+// _center = createCenter sideLogic;   un center existe d�j�
 
 // create && synchronize HC
 _grplogic = createGroup sideLogic;
-_hc_module = _grplogic createUnit ["HighCommand",[0,0,0] , [], 0, ""];
+_hc_module = _grplogic createUnit ["HighCommand",[0,0,0] , [], 0, "NONE"];
 _hc_module synchronizeObjectsAdd [player];
 // done,
 
 // make 1 HC subordinate so that the player will not control all blufor forces
 _grplogic = createGroup sideLogic;
-_sub_module = _grplogic createUnit ["HighCommandsubordinate",[0,0,0] , [], 0, ""];                    
+_sub_module = _grplogic createUnit ["HighCommandsubordinate",[0,0,0] , [], 0, "NONE"];
 _sub_module synchronizeObjectsAdd [_hc_module];

source/dialog/request.sqf

@@ -73,6 +73,8 @@ _index1 = lbAdd [2102, "UAV Darter(5CP)"];                               // 32
 _index1 = lbAdd [2102, "Blackfish Infantry (40CP)"];                     // 33
 _index1 = lbAdd [2102, "Blackfish Vehicle (45CP)"];                      // 34
 _index1 = lbAdd [2102, "Blackfish Armed (60CP)"];                        // 35
+_index1 = lbAdd [2102, "Black Wasp II (50CP)"];                             // 36
+_index1 = lbAdd [2102, "Black Wasp II (Stealth) (60CP)"];                   // 37
 lbSetCurSel [2102, 0];
 
 // Supports  !!! CHECK TO ADD AT INIT

source/dialog/request_squad.sqf

@@ -1,6 +1,9 @@
 _index = lbCurSel 2101;
 
-_spawnPos = getpos hq_blu1;
+//_spawnPos = getpos hq_blu1; blocked by Tuxu
+//center, minDist, maxDist, objDist, waterMode, maxGrad, shoreMode, blacklistPos, defaultPos
+//HQ, minDist=80,max =250, objdist = 20, landmode, maxgrad = 20, shoremode,
+_spawnPos = [getpos hq_blu1, 80, 250, 20, 0, 20, 0] call BIS_fnc_findSafePos;
 _spawnPos = [(_spawnPos select 0)+15, _spawnPos select 1];
 
 switch (_index) do
@@ -186,4 +189,4 @@ switch (_index) do
         };
     };
 };
-publicVariable "commandpointsblu1";
+publicVariable "commandpointsblu1";