Merge branch 'Expirmental'

This commit is contained in:
Zepheris 2020-02-23 22:12:37 -07:00
commit 726dc09dce
7 changed files with 185 additions and 173 deletions

View File

@ -53,7 +53,7 @@
*/ */
// Note that you can define map-specific variants in custom_server\configs\blck_custom_config.sqf // Note that you can define map-specific variants in custom_server\configs\blck_custom_config.sqf
blck_useTimeAcceleration = true; // When true, time acceleration will be periodically updated based on amount of daylight at that time according to the values below. blck_useTimeAcceleration = false; // When true, time acceleration will be periodically updated based on amount of daylight at that time according to the values below.
blck_timeAccelerationDay = 2; // Daytime time accelearation blck_timeAccelerationDay = 2; // Daytime time accelearation
blck_timeAccelerationDusk = 4; // Dawn/dusk time accelearation blck_timeAccelerationDusk = 4; // Dawn/dusk time accelearation
blck_timeAccelerationNight = 12; // Nighttim time acceleration blck_timeAccelerationNight = 12; // Nighttim time acceleration

View File

@ -29,7 +29,7 @@
blck_simulationManager = blck_useBlckeaglsSimulationManagement; blck_simulationManager = blck_useBlckeaglsSimulationManagement;
//diag_log format["[blckeagls] blck_configs: blck_simulationManager = %1",blck_simulationManager]; //diag_log format["[blckeagls] blck_configs: blck_simulationManager = %1",blck_simulationManager];
// Note that you can define map-specific variants in custom_server\configs\blck_custom_config.sqf // Note that you can define map-specific variants in custom_server\configs\blck_custom_config.sqf
blck_useTimeAcceleration = true; // When true, time acceleration will be periodically updated based on amount of daylight at that time according to the values below. blck_useTimeAcceleration = false; // When true, time acceleration will be periodically updated based on amount of daylight at that time according to the values below.
blck_timeAccelerationDay = 2; // Daytime time accelearation blck_timeAccelerationDay = 2; // Daytime time accelearation
blck_timeAccelerationDusk = 4; // Dawn/dusk time accelearation blck_timeAccelerationDusk = 4; // Dawn/dusk time accelearation
blck_timeAccelerationNight = 8; // Nighttim time acceleration blck_timeAccelerationNight = 8; // Nighttim time acceleration

View File

@ -151,11 +151,11 @@ class FSM
" _this setVariable[""LAST_CHECK"", diag_tickTime];" \n " _this setVariable[""LAST_CHECK"", diag_tickTime];" \n
" _lastCheck = diag_tickTime;" \n " _lastCheck = diag_tickTime;" \n
" };" \n " };" \n
" if (diag_tickTime - _lastCheck > 1200) then {" \n " if (diag_tickTime - _lastCheck > 18000) then {" \n
" private _list = (_this nearEntities [[""Epoch_Male_F"",""Epoch_Female_F"",""LandVehicle"",""Ship"",""Air"",""Tank""], 45]) select {isPlayer _x};" \n " private _list = (_this nearEntities [[""Epoch_Male_F"",""Epoch_Female_F"",""LandVehicle"",""Ship"",""Air"",""Tank""], 45]) select {isPlayer _x};" \n
" if (_list isEqualTo []) then {" \n " if (_list isEqualTo []) then {" \n
" _this setVariable [""LAST_CHECK"",nil];" \n " _this setVariable [""LAST_CHECK"",nil];" \n
" //diag_log format[""DEBUG: _cleanIT del %1"", _this];" \n " diag_log format[""DEBUG: _cleanIT del %1"", _this];" \n
" deleteVehicle _this;" \n " deleteVehicle _this;" \n
" };" \n " };" \n
" };" \n " };" \n
@ -177,7 +177,7 @@ class FSM
" deleteVehicle _x;" \n " deleteVehicle _x;" \n
" }forEach ((nearestObjects [_this, [""WeaponHolder""], 2]) select {!(_x iskindof ""Constructions_lockedstatic_F"" || _x iskindof ""Buildable_Storage"")});" \n " }forEach ((nearestObjects [_this, [""WeaponHolder""], 2]) select {!(_x iskindof ""Constructions_lockedstatic_F"" || _x iskindof ""Buildable_Storage"")});" \n
" _this setVariable [""LAST_CHECK"",nil];" \n " _this setVariable [""LAST_CHECK"",nil];" \n
" //diag_log format[""DEBUG: _cleanIT2 del %1"", _this];" \n " diag_log format[""DEBUG: _cleanIT2 del %1"", _this];" \n
" deleteVehicle _this;" \n " deleteVehicle _this;" \n
" _removed = true;" \n " _removed = true;" \n
" };" \n " };" \n

View File

@ -46,7 +46,7 @@ forceRestartTime = 14400; // 4 hour restarts
antagonistChancePDeath = 0.33; //33% chance when player was killed from a other player (selfkill doesn't count) antagonistChancePDeath = 0.33; //33% chance when player was killed from a other player (selfkill doesn't count)
// Player Related // Player Related
cloneCost = 100; // debt incurred on player death cloneCost = 10; // debt incurred on player death
MaxBankDebitforTrade = -50000; // If Player has less money on Bank, Crypto from Trade goes directly to Bank instead to Player MaxBankDebitforTrade = -50000; // If Player has less money on Bank, Crypto from Trade goes directly to Bank instead to Player
// Default Loadout // Default Loadout

View File

@ -85,10 +85,10 @@ copy "%arma3srvpath%\%servername%\BattlEye\addbackpackcargo.log" "%arma3srvpath%
copy "%arma3srvpath%\%servername%\BattlEye\addweaponcargo.log" "%arma3srvpath%\%servername%\RotatedLogs\%dtStamp%\BattlEye\addweaponcargo.log" copy "%arma3srvpath%\%servername%\BattlEye\addweaponcargo.log" "%arma3srvpath%\%servername%\RotatedLogs\%dtStamp%\BattlEye\addweaponcargo.log"
copy "%arma3srvpath%\%servername%\BattlEye\mpeventhandler.log" "%arma3srvpath%\%servername%\RotatedLogs\%dtStamp%\BattlEye\mpeventhandler.log" copy "%arma3srvpath%\%servername%\BattlEye\mpeventhandler.log" "%arma3srvpath%\%servername%\RotatedLogs\%dtStamp%\BattlEye\mpeventhandler.log"
::copy "%arma3srvpath%\dump.rdb" "%arma3srvpath%\DBbackups\RotatedLogs\%dtStamp%\DBbackups\dump.rdb" ::copy "%arma3srvpath%\dump.rdb" "%arma3srvpath%\DBbackups\RotatedLogs\%dtStamp%\DBbackups\dump.rdb"
copy "%arma3srvpath%\DB\dump.rdb" "%arma3srvpath%\DBbackups\RotatedLogs\%dtStamp%\DBbackups\dump.rdb" copy "%arma3srvpath%\DB\dump.rdb" "%arma3srvpath%\%servername%\RotatedLogs\%dtStamp%\dump.rdb"
copy "%arma3srvpath%\%servername%\A3Master_*.log" "%arma3srvpath%\%servername%\RotatedLogs\%dtStamp%\A3Master_*.log" copy "%arma3srvpath%\%servername%\A3Master_*.log" "%arma3srvpath%\%servername%\RotatedLogs\%dtStamp%\"
copy "%arma3srvpath%\%servername%\arma3server_*.rpt" "%arma3srvpath%\%servername%\RotatedLogs\%dtStamp%\arma3server_*.rpt" copy "%arma3srvpath%\%servername%\arma3server_*.rpt" "%arma3srvpath%\%servername%\RotatedLogs\%dtStamp%\"
copy "%arma3srvpath%\%servername%\Epochserver_*.rpt" "%arma3srvpath%\%servername%\RotatedLogs\%dtStamp%\arma3server_*.rpt" copy "%arma3srvpath%\%servername%\Epochserver_*.rpt" "%arma3srvpath%\%servername%\RotatedLogs\"
echo (%date%) (%time%) Logs are backed up now... echo (%date%) (%time%) Logs are backed up now...

View File

@ -97,7 +97,7 @@ showHUD[] =
// A3 specific configs // A3 specific configs
#include "Configs\CfgFunctions.hpp" #include "Configs\CfgFunctions.hpp"
#include "Configs\CfgRemoteExec.hpp" #include "Configs\CfgRemoteExec.hpp"
#include "Configs\CfgDisabledCommands.hpp" //#include "Configs\CfgDisabledCommands.hpp"
class CfgEpochBuild class CfgEpochBuild
{ {

View File

@ -18,3 +18,15 @@ SA_MAX_TOWED_CARGO = 1;
//Test of AI mod //Test of AI mod
TCL_Path = "TCL_System\"; TCL_Path = "TCL_System\";
call compile preprocessFileLineNumbers (TCL_Path+"TCL_Preprocess.sqf"); call compile preprocessFileLineNumbers (TCL_Path+"TCL_Preprocess.sqf");
// Control the epoch ai limit per player
// 1. Epoch_Cloak_F = Cultist
// 2. GreatWhite_F = Great White Shark
// 3. Epoch_Sapper_F = Regular Sapper
// 4. Epoch_SapperB_F = Super Sapper (dark)
// 5. I_UAV_01_F = UAV (that spawns the AI)
// 6. PHANTOM = Invisible phantom
// 7. B_Heli_Transport_01_F = Transport helicopter for the mission system
EPOCH_spawnLimits = [0, 1, 0, 0, 1, 0, 1];