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

Merge pull request #91 from Ghostrider-DbD-/Version-7.79-Build-111

Browse Source 
Version 7 79 build 111
This commit is contained in:
Ghostrider [GRG] 2018-02-05 07:33:29 -05:00 committed by GitHub
commit 679e5aaf87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
@GMS/addons/custom_server/Compiles/Functions/GMS_fnc_mainThread.sqf
View File

@ -1,6 +1,6 @@
/*
By Ghostrider [GRG]
Last modified 8-15-17
--------------------------
License
--------------------------
@ -54,7 +54,6 @@ while {true} do
{
//diag_log format["_fnc_mainThread: 60 second events run at %1",diag_tickTime];
_timer1min = diag_tickTime;
[] call blck_fnc_timeAcceleration;
[] call blck_fnc_spawnPendingMissions;
//diag_log format["_fnc_spawnPendingMissions: blck_numberUnderwaterDynamicMissions = %1 |
if (blck_dynamicUMS_MissionsRuning < blck_numberUnderwaterDynamicMissions) then
@ -83,13 +82,13 @@ while {true} do
//diag_log format["_fnc_mainThread: active SQFscripts include: %1",diag_activeSQFScripts];
diag_log format["_fnc_mainThread: active scripts include: %1",diag_activeScripts];
#endif
};
if (blck_useTimeAcceleration) then
};
if (diag_tickTime - _timer5min > 300) then
{
if (diag_tickTime - _timer5min > 300) then {
if (blck_useTimeAcceleration) then
{
_timer5min = diag_tickTime;
[] call blck_fnc_timeAcceleration;
};
};
};

20
@GMS/addons/custom_server/Compiles/TimeAccel/GMS_fnc_Time.sqf
View File

@ -1,9 +1,10 @@
// GMS_fnc_time.sqf
// by Ghostrider-DBD_
// Last Updated 12/21/16
// Creds to AWOL, A3W, LouD and Creampie for insights.
/*
GMS_fnc_time.sqf
by Ghostrider-DBD_
//if (!isServer) exitWith {};
Credits to AWOL, A3W, LouD and Creampie for insights.
*/
/*
blck_timeAcceleration = true; // When true, time acceleration will be periodically updated based on amount of daylight at that time according to the values below
@ -30,9 +31,10 @@ _time = dayTime;
// blck_debugMode3
#ifdef blck_debugMode
if (blck_debugLevel > 2) then
if (blck_debugLevel >= 2) then
{
diag_log "fnc_Time:: Debug settings ON";
diag_log format["_fnc_Time:: --> blck_useTimeAcceleration = %1", blck_useTimeAcceleration];
diag_log format["_fnc_Time:: -- > _sunrise = %1 | _sunset = %2 | _time = %3",_sunrise,_sunset,_time];
};
#endif
@ -41,7 +43,7 @@ if (blck_debugLevel > 2) then
if (_time > (_sunset + 0.5) || _time < (_sunrise - 0.5)) exitWith {
setTimeMultiplier blck_timeAccelerationNight;
#ifdef blck_debugMode
if (blck_debugLevel > 2) then
if (blck_debugLevel >= 2) then
{
diag_log format["NIGHT TIMGE ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime];
};
@ -53,7 +55,7 @@ if (_time > (_sunrise + 0.5) && _time < (_sunset - 0.5)) exitWith {
setTimeMultiplier blck_timeAccelerationDay;
//diag_log format["DAYTIME ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime];
#ifdef blck_debugMode
if (blck_debugLevel > 2) then
if (blck_debugLevel >= 2) then
{
diag_log format["DAYTIME ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime];
};
@ -63,7 +65,7 @@ if (_time > (_sunrise + 0.5) && _time < (_sunset - 0.5)) exitWith {
// default
setTimeMultiplier blck_timeAccelerationDusk;
#ifdef blck_debugMode
if (blck_debugLevel > 2) then
if (blck_debugLevel >= 2) then
{
diag_log format["DUSK ADJUSTMENT:: time accel updated to %1; time of day = %2",timeMultiplier,dayTime];
};

4
@GMS/addons/custom_server/Missions/UMS/code/GMS_fnc_spawnDynamicUMSMission.sqf
View File

@ -122,7 +122,7 @@ if (_missionTimedOut) exitWith
blck_UMS_ActiveDynamicMissions = blck_UMS_ActiveDynamicMissions - [_coords];
blck_dynamicUMS_MissionsRuning = blck_dynamicUMS_MissionsRuning - 1;
[_blck_localMissionMarker select 0] call compile preprocessfilelinenumbers "debug\deleteMarker.sqf";
[_blck_localMissionMarker select 0] call blck_fnc_deleteMarker;
//_blck_localMissionMarker set [1,[0,0,0]];
//_blck_localMissionMarker set [2,""];
[_objects, 0.1] spawn blck_fnc_cleanupObjects;
@ -469,7 +469,7 @@ if (count _missionLootBoxes > 0) then
}
else
{
_crates = [_coords,[[selectRandom blck_crateTypes,[0,0,0],_crateLoot,_lootCounts]], _loadCratesTiming] call blck_fnc_spawnMissionCrates;
_crates = [_coords,[[selectRandom blck_UMS_crates,[0,0,0],_crateLoot,_lootCounts]], _loadCratesTiming] call blck_fnc_spawnMissionCrates;
};

2
@GMS/addons/custom_server/Missions/UMS/staticMissions/staticMissionExample2_Epoch.sqf
View File

@ -64,7 +64,7 @@ _missionLootBoxes = [ // Paste appropriate lines from M3EDEN editor output her
// where _customLootArray follows the same format as blck_BoxLoot_Red and the other pre-defined arrays and
// where _customlootcountsarray1 also follows the same format as the predefined arrays like blck_lootCountsRed
// ["Box_NATO_Ammo_F",[22893,16766.8,6.31652],[[0,1,0],[0,0,1]],[true,false], _crateLoot, _lootCounts],
[selectRandom blck_UMS_crates,[22584.9,15282.2,-1],[[0,1,0],[0,0,1]],[true,false], _crateLoot, _lootCounts]
[selectRandom blck_UMS_crates,[22584,15304,-1],[[0,1,0],[0,0,1]],[true,false], _crateLoot, _lootCounts]
]; // If this array is empty a single loot chest will be added at the center. If you add items loot chest(s) will be spawned in specific positions.

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

@ -1,6 +1,6 @@
private ["_version","_versionDate"];
blck_version = "6.79 Build 109";
blck_version = "6.79 Build 111";
_blck_version = blck_version;
_blck_versionDate = "1-19-18 7:00 PM";
_blck_versionDate = "2-5-18 7:00 AM";
blck_pvs_version = _blck_version;
publicVariable blck_pvs_version;