removing repair fnc from socom veh, displayname marker, disco params

gruppe-adler · Jan 21, 2019 · e52b3ca · e52b3ca
1 parent 149654d
commit e52b3ca
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/BC_buyables/factions/usa.hpp b/BC_buyables/factions/usa.hpp
@@ -69,7 +69,7 @@ class USA {
             description = "1 GPS\nNO Thermals\nNO Benches";
             price = 10;
             stock = 2;
-            code = "(_this select 0) addItemCargoGlobal ['ACE_NVG_Wide',2];(_this select 0) addItemCargoGlobal ['ItemGPS',1];[(_this select 0)] call ace_fastroping_fnc_equipFRIES;(_this select 0) disableTIEquipment true;";
+            code = "(_this select 0) addItemCargoGlobal ['ACE_NVG_Wide',2];(_this select 0) addItemCargoGlobal ['ItemGPS',1];(_this select 0) disableTIEquipment true;";
             spawnEmpty = 1;
             vehicleInit = "[[],[]]";
         };
@@ -99,6 +99,7 @@ class USA {
             wheelCargo = 3;
             condition = "BC_IS_WOODLAND";
             vehicleInit = "[['rhs_woodland',1],['hide_spare',0]]";
+            code = "(_this select 0) setVariable ['ace_rearm_isSupplyVehicle', false, true]; (_this select 0) setVariable ['ACE_isRepairVehicle', false, true];";
         };
 
         class rhsusf_M1078A1R_SOV_M2_D_fmtv_socom: rhsusf_M1078A1R_SOV_M2_WD_fmtv_socom {

diff --git a/BC_buymenu/functions/fn_buyComplete.sqf b/BC_buymenu/functions/fn_buyComplete.sqf
@@ -9,7 +9,7 @@ if (!isServer) exitWith {};
 // systemChat str "buycomplete";
 
 private _spawnPos = (getPos _startVehicle);
-private _roadArray = _spawnPos nearRoads 500;
+private _roadArray = _spawnPos nearRoads 750;
 private _closestRoads = [_roadArray, [_spawnPos], { _input0 distance _x }, "ASCEND"] call BIS_fnc_sortBy;
 
 

diff --git a/BC_buymenu/functions/fn_vehicleMarker.sqf b/BC_buymenu/functions/fn_vehicleMarker.sqf
@@ -6,9 +6,7 @@ params ["_vehicle", "_baseConfigName", "_categoryConfigName", "_itemConfigName"]
 
 if (!hasInterface) exitWith {};
 
-_displayName = [(missionConfigFile >> "CfgGradBuymenu" >> _baseConfigName >> _categoryConfigName >> _itemConfigName >> "displayName"), "text", "Vehicle"] call CBA_fnc_getConfigEntry;
-
-
+private _displayName = getText (configFile >>  "CfgVehicles" >> _itemConfigName >> "displayName");
 
 _function = {
     params ["_args", "_handle"];

diff --git a/initserver.sqf b/initserver.sqf
@@ -15,7 +15,7 @@ publicVariable "DEBUG_MODE";
 
 
 addMissionEventHandler ["HandleDisconnect",{
-    params ["", "", "", "_name"];
+    params ["_unit", "_id", "_uid", "_name"];
 
     if (_unit getVariable ["BC_spawnSelector", false] && !OPFOR_TELEPORTED) then {
         private _spawnSelector = [east, _unit] call BC_setup_fnc_getHighestRankOfSide;

diff --git a/mission.sqm b/mission.sqm
@@ -16,10 +16,10 @@ class EditorData
 	};
 	class Camera
 	{
-		pos[]={1611.7966,9.5712538,5313.6001};
-		dir[]={-0.47132915,-0.31366354,0.82444853};
-		up[]={-0.15572304,0.94949061,0.2723898};
-		aside[]={0.86825103,-2.0944572e-006,0.49636275};
+		pos[]={1600.5537,33.294987,5276.7852};
+		dir[]={0.4062908,-0.29414397,0.86525154};
+		up[]={0.12506503,0.95571905,0.26634428};
+		aside[]={0.90528005,-2.1953601e-006,-0.42509413};
 	};
 };
 binarizationWanted=0;
@@ -118,7 +118,7 @@ class ScenarioData
 };
 class CustomAttributes
 {
-	class Category1
+	class Category0
 	{
 		name="Scenario";
 		class Attribute0