Merge remote-tracking branch 'refs/remotes/origin/master' into dev

armazac · armazac · commit 3a178c42cba3 · 2019-05-28T10:22:14.000+10:00
diff --git a/addons/overthrow_main.pbo b/addons/overthrow_main.pbo
diff --git a/addons/overthrow_main/campaign/missions/OverthrowMpAltis.Altis/initVar.sqf b/addons/overthrow_main/campaign/missions/OverthrowMpAltis.Altis/initVar.sqf
@@ -68,7 +68,7 @@ OT_vehTypes_civignore = ["C_Hatchback_01_F","C_Hatchback_01_sport_F",OT_vehType_
 OT_illegalHeadgear = ["H_MilCap_gen_F","H_Beret_gen_F","H_HelmetB_TI_tna_F"];
 OT_illegalVests = ["V_TacVest_gen_F"];
 
-OT_clothes_locals = ["U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_C_Poor_1","U_C_Poor_2","U_C_Poor_shorts_1","U_C_Poor_shorts_2","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_stripped"];
+OT_clothes_locals = ["U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_C_Poor_1","U_C_Poor_2","U_C_Poor_shorts_1","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_stripped"];
 OT_clothes_expats = ["U_I_C_Soldier_Bandit_5_F","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_salmon","U_C_Poloshirt_stripped","U_C_Man_casual_6_F","U_C_Man_casual_4_F","U_C_Man_casual_5_F"];
 OT_clothes_tourists = [];
 OT_clothes_priest = "U_C_Man_casual_2_F";
diff --git a/addons/overthrow_main/campaign/missions/OverthrowMpLivonia.Enoch/initVar.sqf b/addons/overthrow_main/campaign/missions/OverthrowMpLivonia.Enoch/initVar.sqf
@@ -115,7 +115,7 @@ OT_vehTypes_civignore = ["C_Hatchback_01_F","C_Hatchback_01_sport_F",OT_vehType_
 OT_illegalHeadgear = ["H_MilCap_gen_F","H_Beret_gen_F","H_HelmetB_TI_tna_F"];
 OT_illegalVests = ["V_TacVest_gen_F"];
 
-OT_clothes_locals = ["U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_C_Poor_1","U_C_Poor_2","U_C_Poor_shorts_1","U_C_Poor_shorts_2","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_stripped"];
+OT_clothes_locals = ["U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_C_Poor_1","U_C_Poor_2","U_C_Poor_shorts_1","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_stripped"];
 OT_clothes_expats = ["U_I_C_Soldier_Bandit_5_F","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_salmon","U_C_Poloshirt_stripped","U_C_Man_casual_6_F","U_C_Man_casual_4_F","U_C_Man_casual_5_F"];
 OT_clothes_tourists = [];
 OT_clothes_priest = "U_C_Man_casual_2_F";
diff --git a/addons/overthrow_main/campaign/missions/OverthrowMpMalden.Malden/initVar.sqf b/addons/overthrow_main/campaign/missions/OverthrowMpMalden.Malden/initVar.sqf
@@ -68,7 +68,7 @@ OT_vehTypes_civignore = ["C_Hatchback_01_F","C_Hatchback_01_sport_F",OT_vehType_
 OT_illegalHeadgear = ["H_MilCap_gen_F","H_Beret_gen_F","H_HelmetB_TI_tna_F"];
 OT_illegalVests = ["V_TacVest_gen_F"];
 
-OT_clothes_locals = ["U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_C_Poor_1","U_C_Poor_2","U_C_Poor_shorts_1","U_C_Poor_shorts_2","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_stripped"];
+OT_clothes_locals = ["U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_C_Poor_1","U_C_Poor_2","U_C_Poor_shorts_1","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_stripped"];
 OT_clothes_expats = ["U_I_C_Soldier_Bandit_5_F","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_salmon","U_C_Poloshirt_stripped","U_C_Man_casual_6_F","U_C_Man_casual_4_F","U_C_Man_casual_5_F"];
 OT_clothes_tourists = [];
 OT_clothes_priest = "U_C_Man_casual_2_F";
diff --git a/addons/overthrow_main/campaign/missions/OverthrowMpTanoa.Tanoa/initVar.sqf b/addons/overthrow_main/campaign/missions/OverthrowMpTanoa.Tanoa/initVar.sqf
@@ -70,7 +70,7 @@ OT_vehTypes_civignore = ["C_Hatchback_01_F","C_Hatchback_01_sport_F",OT_vehType_
 OT_illegalHeadgear = ["H_MilCap_gen_F","H_Beret_gen_F","H_HelmetB_TI_tna_F"];
 OT_illegalVests = ["V_TacVest_gen_F"];
 
-OT_clothes_locals = ["U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_C_Poor_1","U_C_Poor_2","U_C_Poor_shorts_1","U_C_Poor_shorts_2","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_stripped"];
+OT_clothes_locals = ["U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_C_Poor_1","U_C_Poor_2","U_C_Poor_shorts_1","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_stripped"];
 OT_clothes_expats = ["U_I_C_Soldier_Bandit_5_F","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_salmon","U_C_Poloshirt_stripped","U_C_Man_casual_6_F","U_C_Man_casual_4_F","U_C_Man_casual_5_F"];
 OT_clothes_tourists = [];
 OT_clothes_priest = "U_C_Man_casual_2_F";
diff --git a/addons/overthrow_main/campaign/missions/OverthrowMpTanoa.Tanoa/mission.sqm b/addons/overthrow_main/campaign/missions/OverthrowMpTanoa.Tanoa/mission.sqm
@@ -16,14 +16,14 @@ class EditorData
 	};
 	class LayerIndexProvider
 	{
-		nextID=374;
+		nextID=375;
 	};
 	class Camera
 	{
 		pos[]={8260.8291,19.001881,1106.7407};
 		dir[]={0,-0.70710683,0.70710683};
 		up[]={0,0.70710677,0.70710677};
-		aside[]={0.99999994,0,-0};
+		aside[]={0.99999994,0,0};
 	};
 };
 binarizationWanted=0;
diff --git a/addons/overthrow_main/campaign/missions/OverthrowSpAltis.Altis/initVar.sqf b/addons/overthrow_main/campaign/missions/OverthrowSpAltis.Altis/initVar.sqf
@@ -68,7 +68,7 @@ OT_vehTypes_civignore = ["C_Hatchback_01_F","C_Hatchback_01_sport_F",OT_vehType_
 OT_illegalHeadgear = ["H_MilCap_gen_F","H_Beret_gen_F","H_HelmetB_TI_tna_F"];
 OT_illegalVests = ["V_TacVest_gen_F"];
 
-OT_clothes_locals = ["U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_C_Poor_1","U_C_Poor_2","U_C_Poor_shorts_1","U_C_Poor_shorts_2","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_stripped"];
+OT_clothes_locals = ["U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_C_Poor_1","U_C_Poor_2","U_C_Poor_shorts_1","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_stripped"];
 OT_clothes_expats = ["U_I_C_Soldier_Bandit_5_F","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_salmon","U_C_Poloshirt_stripped","U_C_Man_casual_6_F","U_C_Man_casual_4_F","U_C_Man_casual_5_F"];
 OT_clothes_tourists = [];
 OT_clothes_priest = "U_C_Man_casual_2_F";
diff --git a/addons/overthrow_main/campaign/missions/OverthrowSpMalden.Malden/initVar.sqf b/addons/overthrow_main/campaign/missions/OverthrowSpMalden.Malden/initVar.sqf
@@ -68,7 +68,7 @@ OT_vehTypes_civignore = ["C_Hatchback_01_F","C_Hatchback_01_sport_F",OT_vehType_
 OT_illegalHeadgear = ["H_MilCap_gen_F","H_Beret_gen_F","H_HelmetB_TI_tna_F"];
 OT_illegalVests = ["V_TacVest_gen_F"];
 
-OT_clothes_locals = ["U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_C_Poor_1","U_C_Poor_2","U_C_Poor_shorts_1","U_C_Poor_shorts_2","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_stripped"];
+OT_clothes_locals = ["U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_C_Poor_1","U_C_Poor_2","U_C_Poor_shorts_1","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_stripped"];
 OT_clothes_expats = ["U_I_C_Soldier_Bandit_5_F","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_salmon","U_C_Poloshirt_stripped","U_C_Man_casual_6_F","U_C_Man_casual_4_F","U_C_Man_casual_5_F"];
 OT_clothes_tourists = [];
 OT_clothes_priest = "U_C_Man_casual_2_F";
diff --git a/addons/overthrow_main/campaign/missions/OverthrowSpTanoa.Tanoa/initVar.sqf b/addons/overthrow_main/campaign/missions/OverthrowSpTanoa.Tanoa/initVar.sqf
@@ -70,7 +70,7 @@ OT_vehTypes_civignore = ["C_Hatchback_01_F","C_Hatchback_01_sport_F",OT_vehType_
 OT_illegalHeadgear = ["H_MilCap_gen_F","H_Beret_gen_F","H_HelmetB_TI_tna_F"];
 OT_illegalVests = ["V_TacVest_gen_F"];
 
-OT_clothes_locals = ["U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_C_Poor_1","U_C_Poor_2","U_C_Poor_shorts_1","U_C_Poor_shorts_2","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_stripped"];
+OT_clothes_locals = ["U_I_C_Soldier_Bandit_2_F","U_I_C_Soldier_Bandit_3_F","U_C_Poor_1","U_C_Poor_2","U_C_Poor_shorts_1","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_stripped"];
 OT_clothes_expats = ["U_I_C_Soldier_Bandit_5_F","U_C_Poloshirt_blue","U_C_Poloshirt_burgundy","U_C_Poloshirt_redwhite","U_C_Poloshirt_salmon","U_C_Poloshirt_stripped","U_C_Man_casual_6_F","U_C_Man_casual_4_F","U_C_Man_casual_5_F"];
 OT_clothes_tourists = [];
 OT_clothes_priest = "U_C_Man_casual_2_F";
diff --git a/addons/overthrow_main/functions/AI/NPC/fn_initMilitary.sqf b/addons/overthrow_main/functions/AI/NPC/fn_initMilitary.sqf
@@ -4,10 +4,12 @@ _type = typeof _unit;
 
 //Make silencers rare
 _items = primaryWeaponItems _unit;
-if !(_items#0 isEqualTo "") then {
-	if((random 100) < 99) then {
-		_unit removePrimaryWeaponItem (_items#0);
-	}
+if(!isNil "_items") then {
+	if !(_items#0 isEqualTo "") then {
+		if((random 100) < 99) then {
+			_unit removePrimaryWeaponItem (_items#0);
+		}
+	};
 };
 
 //Re-Equip this soldier (75% of the time)
@@ -39,9 +41,11 @@ if((random 100) > 25) then {
 
 
 	//put accessories back (where possible)
-	{
-		_unit addWeaponItem [_wpn, _x];
-	}foreach(_accessories);
+	if(!isNil "_accessories") then {
+		{
+			_unit addWeaponItem [_wpn, _x];
+		}foreach(_accessories);
+	};
 
 	_magazines = getArray (configFile / "CfgWeapons" / _wpn / "magazines");
 
@@ -165,4 +169,4 @@ _unit addEventHandler ["HandleDamage", {
 	};
 }];
 
-_unit addEventHandler ["Dammaged", OT_fnc_UnitDamagedHandler];
+_unit addEventHandler ["Dammaged", OT_fnc_EnemyDamagedHandler];
diff --git a/addons/overthrow_main/functions/UI/dialogs/fn_mainMenu.sqf b/addons/overthrow_main/functions/UI/dialogs/fn_mainMenu.sqf
@@ -94,13 +94,9 @@ if(typename _b isEqualTo "ARRAY") then {
 			ctrlEnable [1609,true];
 			ctrlSetText [1609,"Procurement"];
 
-			if(_owner isEqualTo getplayerUID player) then {
-				ctrlSetText [1608,format["Sell ($%1)",[_sell, 1, 0, true] call CBA_fnc_formatNumber]];
-				ctrlEnable [1608,true];
-			}else{
-				ctrlSetText [1608,"Sell"];
-				ctrlEnable [1608,false];
-			};
+			ctrlSetText [1608,"Sell"];
+			ctrlEnable [1608,false];
+
 			ctrlSetText [1610,"Repair"];
 			if((damage _building) isEqualTo 1) then {
 				ctrlEnable [1610,true];
diff --git a/addons/overthrow_main/functions/UI/dialogs/fn_sellDialog.sqf b/addons/overthrow_main/functions/UI/dialogs/fn_sellDialog.sqf
@@ -14,6 +14,7 @@ private _numitems = 0;
 
 	_name = "";
 	_pic = "";
+	_cansell = true;
 	if(_cls isKindOf ["None",configFile >> "CfgGlasses"]) then {
 		_name = _cls call OT_fnc_glassesGetName;
 		_pic = _cls call OT_fnc_glassesGetPic;
@@ -27,14 +28,18 @@ private _numitems = 0;
 		_pic = _cls call OT_fnc_magazineGetPic;
 	};
 	if(_cls isKindOf "Bag_Base") then {
-		_name = _cls call OT_fnc_vehicleGetName;
-		_pic = _cls call OT_fnc_vehicleGetPic;
+		_cansell = false;
+	};
+	if(_cls in OT_allClothing) then {
+		_cansell = false;
+	};
+	if(_cansell) then {
+		_idx = lbAdd [1500,format["%1 x %2 ($%3)",_num,_name,_price]];
+		lbSetPicture [1500,_idx,_pic];
+		lbSetValue [1500,_idx,_price];
+		lbSetData [1500,_idx,_cls];
+		_numitems = _numitems + 1;
 	};
-	_idx = lbAdd [1500,format["%1 x %2 ($%3)",_num,_name,_price]];
-	lbSetPicture [1500,_idx,_pic];
-	lbSetValue [1500,_idx,_price];
-	lbSetData [1500,_idx,_cls];
-	_numitems = _numitems + 1;
 }foreach(_playerstock);
 if(_cursel >= _numitems) then {_cursel = 0};
 lbSetCurSel [1500, _cursel];
diff --git a/addons/overthrow_main/functions/UI/display/fn_displayLogisticDetails.sqf b/addons/overthrow_main/functions/UI/display/fn_displayLogisticDetails.sqf
@@ -76,7 +76,7 @@ private _gunOut = false;
 } forEach ("true" configClasses (configfile >> "CfgVehicles" >> _cls >> "HitPoints"));
 
 if !(_cls isKindOf "StaticWeapon") then {
-    _txt = format["%1Fuel: %1%2<br/>",_txt,_fuel,"%"];
+    _txt = format["%1Fuel: %2%3<br/>",_txt,_fuel,"%"];
     _txt = format["%1Load: %2kg<br/>",_txt,_loadKg];
     if(_hasWheels) then {
         if(_wheelsNeeded isEqualTo 0) then {
diff --git a/addons/overthrow_main/functions/actions/fn_exportAll.sqf b/addons/overthrow_main/functions/actions/fn_exportAll.sqf
@@ -15,12 +15,12 @@ if(_town in (server getVariable ["NATOabandoned",[]])) then {
 [5,false] call OT_fnc_progressBar;
 sleep 5;
 
-private _combinedItems = OT_allItems + OT_allBackpacks + OT_Resources + OT_allClothing;
+private _combinedItems = OT_allItems + OT_allBackpacks + OT_Resources;
 private _total = 0;
 {
 	_x params ["_cls", "_num"];
 	private _count = 0;
-	if(_doillegal || _cls in _combinedItems) then {
+	if((_doillegal || _cls in _combinedItems) && !(_cls in OT_allClothing)) then {
 		private _baseprice = [OT_nation,_cls,0] call OT_fnc_getSellPrice;
 		private _costprice = round(_baseprice * 0.6); //The cost of export
 		if(_cls in OT_allDrugs) then {
diff --git a/addons/overthrow_main/functions/economy/fn_initEconomyLoad.sqf b/addons/overthrow_main/functions/economy/fn_initEconomyLoad.sqf
@@ -55,6 +55,11 @@ diag_log format["Overthrow: Economy version is %1",_version];
             };
         };
     };
+
+    private _garrison = server getVariable [format['police%1',_town],0];
+    _mrkid = format["%1-police",_town];
+    _mrkid setMarkerText format["%1",_garrison];
+
 }foreach(OT_allTowns);
 
 if(_version < OT_economyVersion) then {
diff --git a/addons/overthrow_main/functions/fn_initVar.sqf b/addons/overthrow_main/functions/fn_initVar.sqf
@@ -750,17 +750,21 @@ OT_allLegalClothing = [];
 	private _name = configName _x;
 	private _short = getText (configFile >> "CfgWeapons" >> _name >> "descriptionShort");
 	private _supply = getText(configfile >> "CfgWeapons" >> _name >> "ItemInfo" >> "containerClass");
+	private _mass = getNumber(configfile >> "CfgWeapons" >> _name >> "ItemInfo" >> "mass");
 	private _carry = getNumber(configfile >> "CfgVehicles" >> _supply >> "maximumLoad");
-	private _cost = round(_carry * 0.5);
+	private _cost = round(_mass * 4);
 
-	OT_allClothing pushback _name;
 	private _c = _name splitString "_";
-	private _side = _c select 1;
-	if((_name == "V_RebreatherIA" || _side == "C" || _side == "I") && (_c select (count _c - 1) != "VR")) then {
-		OT_allLegalClothing pushback _name;
-	};
-	if (isServer && isNil {cost getVariable _name}) then {
-		cost setVariable [_name,[_cost,0,0,1],true];
+	if(_c select (count _c - 1) != "VR") then {
+		OT_allClothing pushback _name;
+
+		private _side = _c select 1;
+		if((_name == "V_RebreatherIA" || _side == "C" || _side == "I") && (_c select (count _c - 1) != "VR")) then {
+			OT_allLegalClothing pushback _name;
+		};
+		if (isServer && isNil {cost getVariable _name}) then {
+			cost setVariable [_name,[_cost,0,0,1],true];
+		};
 	};
 } foreach (_allUniforms);
 
diff --git a/addons/overthrow_main/functions/player/fn_illegalInCar.sqf b/addons/overthrow_main/functions/player/fn_illegalInCar.sqf
@@ -1,5 +1,5 @@
 //They are driving or in a non-civilian vehicle including statics
-if !((typeof (vehicle _this)) in (OT_allVehicles+OT_allBoats)) exitWith {	
+if !((typeof (vehicle _this)) in (OT_allVehicles+OT_allBoats-["OT_I_Truck_recovery"])) exitWith {
 	true;
 };
 //They are driving or in a car with a weapon attached
diff --git a/addons/overthrow_main/functions/player/fn_mapHandler.sqf b/addons/overthrow_main/functions/player/fn_mapHandler.sqf
@@ -26,7 +26,7 @@ if(isMultiplayer) then {
 
 private _grpUnits = groupSelectedUnits player;
 {
-	if (!(isPlayer _x) && {(side _x isEqualTo resistance) || captive _x} && !(_x getVariable ["polgarrison",false])) then {
+	if (!(isPlayer _x) && {(side _x isEqualTo resistance) || captive _x} && (_x getVariable ["polgarrison",""]) isEqualTo "") then {
 		private _veh = vehicle _x;
 		if(_veh isEqualTo _x) then {
 			private _color = [[0,0.2,0,1],[0,0.5,0,1]] select captive _x;
diff --git a/addons/overthrow_main/functions/player/fn_mapSystem.sqf b/addons/overthrow_main/functions/player/fn_mapSystem.sqf
@@ -62,7 +62,7 @@ _handler = {
 	};
 	_t = 2;
 	{
-		if (!(isPlayer _x) && {(side _x isEqualTo resistance) || captive _x} && !(_x getVariable ["polgarrison",false])) then {
+		if (!(isPlayer _x) && {(side _x isEqualTo resistance) || captive _x} && (_x getVariable ["polgarrison",""]) isEqualTo "") then {
 			_veh = vehicle _x;
 			if(_veh isEqualTo _x) then {
 				_color = [0,0.5,0,1];
diff --git a/addons/overthrow_main/functions/virtualization/spawners/fn_spawnNATOObjective.sqf b/addons/overthrow_main/functions/virtualization/spawners/fn_spawnNATOObjective.sqf
@@ -64,6 +64,9 @@ if(_name in OT_allComms) then {
 
 	if(_count < _numNATO) then {
 		_start = _posTown findEmptyPosition [2,50];
+		if((count _start) isEqualTo 0) then {
+			_start = _posTown findEmptyPosition [2,150];
+		};
 		_civ = _group createUnit [OT_NATO_Unit_AA_ass, _start, [], 0, "NONE"];
 		_civ setVariable ["garrison",_name,false];
 		_civ setRank "CAPTAIN";
