Arma3_Epoch/blckeagles-revisited-RC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small bug fixes / CBA compatability added

Browse Source
This commit is contained in:
Chris Cardozo 2020-09-09 07:56:24 -04:00
parent 02847bdbe2
commit 58dbfd509a
3 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
@GMS/addons/custom_server/Compiles/Units/GMS_fnc_spawnUnit.sqf
View File

@ -89,12 +89,16 @@ _weap = selectRandom _weaponList;
_unit addWeaponGlobal _weap; _unit addWeaponGlobal _weap;
_ammoChoices = getArray (configFile >> "CfgWeapons" >> _weap >> "magazines"); _ammoChoices = getArray (configFile >> "CfgWeapons" >> _weap >> "magazines");
_unit addMagazines[selectRandom _ammochoices,3]; _unit addMagazines[selectRandom _ammochoices,3];
/*
_optics = getArray (configfile >> "CfgWeapons" >> _weap >> "WeaponSlotsInfo" >> "CowsSlot" >> "compatibleItems"); _optics = getArray (configfile >> "CfgWeapons" >> _weap >> "WeaponSlotsInfo" >> "CowsSlot" >> "compatibleItems");
_pointers = getArray (configFile >> "CfgWeapons" >> _weap >> "WeaponSlotsInfo" >> "PointerSlot" >> "compatibleItems"); _pointers = getArray (configFile >> "CfgWeapons" >> _weap >> "WeaponSlotsInfo" >> "PointerSlot" >> "compatibleItems");
_muzzles = getArray (configFile >> "CfgWeapons" >> _weap >> "WeaponSlotsInfo" >> "MuzzleSlot" >> "compatibleItems"); _muzzles = getArray (configFile >> "CfgWeapons" >> _weap >> "WeaponSlotsInfo" >> "MuzzleSlot" >> "compatibleItems");
_underbarrel = getArray (configFile >> "CfgWeapons" >> _weap >> "WeaponSlotsInfo" >> "UnderBarrelSlot" >> "compatibleItems"); _underbarrel = getArray (configFile >> "CfgWeapons" >> _weap >> "WeaponSlotsInfo" >> "UnderBarrelSlot" >> "compatibleItems");
*/
_muzzles = [_weap, 101] call BIS_fnc_compatibleItems;
_optics = [_weap, 201] call BIS_fnc_compatibleItems;
_pointers = [_weap, 301] call BIS_fnc_compatibleItems;
_underbarrel = [_weap, 302] call BIS_fnc_compatibleItems;
if (random 1 < 0.4) then {_unit addPrimaryWeaponItem (selectRandom _muzzles)}; if (random 1 < 0.4) then {_unit addPrimaryWeaponItem (selectRandom _muzzles)};
if (random 1 < 0.4) then {_unit addPrimaryWeaponItem (selectRandom _optics)}; if (random 1 < 0.4) then {_unit addPrimaryWeaponItem (selectRandom _optics)};

31
@GMS/addons/custom_server/Compiles/Vehicles/GMS_fnc_spawnVehicle.sqf
View File

@ -13,7 +13,7 @@
#include "\q\addons\custom_server\Configs\blck_defines.hpp"; #include "\q\addons\custom_server\Configs\blck_defines.hpp";
params["_vehType","_pos",["_special","NONE"],["_radius",30]]; params["_vehType","_pos",["_special","NONE"],["_radius",30]];
//diag_log format["_spawnVehicle: _vehType = %1 | _special = %2 | _radiu = %3",_vehType,_special,_radius];
private _veh = createVehicle[_vehType, _pos, [], _radius, _special]; private _veh = createVehicle[_vehType, _pos, [], _radius, _special];
_veh setVectorUp surfaceNormal position _veh; _veh setVectorUp surfaceNormal position _veh;
_veh allowDamage true; _veh allowDamage true;
@ -21,6 +21,33 @@ _veh enableRopeAttach true;
_veh setVariable["blck_vehicle",true]; _veh setVariable["blck_vehicle",true];
[_veh] call blck_fnc_protectVehicle; [_veh] call blck_fnc_protectVehicle;
[_veh] call blck_fnc_emptyObject; [_veh] call blck_fnc_emptyObject;
if (_vehType isKindOf "Plane") then {
private _pos = [_pos select 0, _pos select 1, ((getPos _veh) select 2 + 500)];
_veh setPosATL _pos;
// adapted from: https://community.bistudio.com/wiki/setVelocity
private _vel = velocity _vehicle;
private _dir = direction _vehicle;
#define speedIncr 250
_veh setVelocity [
(_vel select 0) + (sin _dir * speedIncr),
(_vel select 1) + (cos _dir * speedIncr),
(_vel select 2)
];
_veh flyInHeightASL [200,100,400];
};
if (_vehType isKindOf "Helicopter") then
{
private _pos = [_pos select 0, _pos select 1, ((getPos _veh) select 2 + 100)];
_veh setPosATL _pos;
private _vel = velocity _vehicle;
private _dir = direction _vehicle;
#define speedIncr 25
_veh setVelocity [
(_vel select 0) + (sin _dir * speedIncr),
(_vel select 1) + (cos _dir * speedIncr),
(_vel select 2)
];
_veh flyInHeightASL [200,100,400];
};
_veh _veh

6
@GMS/addons/custom_server/init/build.sqf
View File

@ -1,4 +1,4 @@
#define blck_buildNumber 218 #define blck_buildNumber 219
#define blck_versionNumber 7.00 #define blck_versionNumber 7.01
#define blck_buildDate "8-29-20" #define blck_buildDate "9-9-20"