diff --git a/Changelogs/0.3.9.0.txt b/Changelogs/0.3.9.0.txt index f0c15cde..06176fd8 100644 --- a/Changelogs/0.3.9.0.txt +++ b/Changelogs/0.3.9.0.txt @@ -25,6 +25,7 @@ maxAimingAccuracy -> maxGeneral - Set the maximum value for each available AI sk [Info] A big thanks to Isaac, Axeman's chief tester! **Server Only** +[Added] Allow Epoch Events to accept full file path if 4th variable in the EpochEvents array is set to 0. Default is 1. [Added] Function to effect a players Crypto server side: - [_player,100] call EPOCH_server_effectCrypto; // adds 100 - [_player,-100] call EPOCH_server_effectCrypto; // removes 100 diff --git a/Server_Install_Pack/@epochhive/epochconfig.hpp b/Server_Install_Pack/@epochhive/epochconfig.hpp index 6ebd741f..f34d3869 100644 --- a/Server_Install_Pack/@epochhive/epochconfig.hpp +++ b/Server_Install_Pack/@epochhive/epochconfig.hpp @@ -12,11 +12,11 @@ lootMultiplier = 0.5; // 1 = max loot bias. This controls how much loot can payo // Events WeatherStaticForecast[] = {}; // Default: {75.5,0,{0,0,0},0,{1,1}}; // Clear day; {19,1,{1,1,40},1,{5,5}}; // Cold Foggy Rainy Overcast Windy; Format: {temp ,rain ,fog ,overcast ,wind } events[] = { - { 3600, "CarnivalSpawner", 0 }, // SECOND , EVENT , INIT (1 or 0) 1 = run script at startup, 0 normal delay - { 2400, "EarthQuake", 0 }, - { 1800, "ChangeWeather", 1 }, - { 1200, "ContainerSpawner", 0 }, - { 300, "PlantSpawner", 0 } //No comma on last Entry + { 3600, "CarnivalSpawner", 0 , 1}, // SECOND , EVENT , INIT 1 = run script at startup, 0 normal delay, PREPOSTFIX 1 = use pre/postfix path (inside epoch settings pbo) 0 = use full file path + { 2400, "EarthQuake", 0 , 1}, + { 1800, "ChangeWeather", 1 , 1}, + { 1200, "ContainerSpawner", 0 , 1}, + { 300, "PlantSpawner", 0 , 1} //No comma on last Entry }; // Antagonists diff --git a/Sources/epoch_server/system/server_monitor.fsm b/Sources/epoch_server/system/server_monitor.fsm index 8cb5c289..b36ed9ec 100644 --- a/Sources/epoch_server/system/server_monitor.fsm +++ b/Sources/epoch_server/system/server_monitor.fsm @@ -33,8 +33,8 @@ link16[] = {8,2}; link17[] = {9,2}; link18[] = {10,2}; link19[] = {11,2}; -globals[] = {25.000000,1,0,0,0,640,480,1,3,6316128,1,415.627258,1020.872498,-120.027557,-522.247498,677,880,1}; -window[] = {2,-1,-1,-1,-1,864,104,1396,104,3,695}; +globals[] = {25.000000,1,0,0,0,640,480,1,3,6316128,1,415.627258,1020.872498,-120.027557,-522.247498,898,880,1}; +window[] = {2,-1,-1,-1,-1,787,34,1326,27,3,916}; *//*%FSM*/ class FSM { @@ -385,7 +385,7 @@ class FSM action=/*%FSM*/"// Epoch Events" \n "_pvehTime = diag_tickTime;" \n "{" \n - " _x params [""_time"", ""_scriptName"", [""_runAtStart"",0]];" \n + " _x params [""_time"", ""_scriptName"", [""_runAtStart"",0],[""_usePrePostfix"",1]];" \n " _eventKey = format[""EPOCH_EVENT_%1"", _forEachIndex];" \n " _lastTime = missionNamespace getVariable _eventKey;" \n " if (isNil ""_lastTime"") then {" \n @@ -398,7 +398,13 @@ class FSM " };" \n " if ((diag_tickTime - _lastTime) >= _time) then {" \n " missionNamespace setVariable[_eventKey, diag_tickTime];" \n - " _handle = [] execVM format[""\a3_epoch_server_settings\EpochEvents\%1.sqf"",_scriptName];" \n + " _preFix = """";" \n + " _postFix = """";" \n + " if (_usePrePostfix == 1) then {" \n + " _preFix = ""\epoch_server_settings\EpochEvents\"";" \n + " _postFix = "".sqf"";" \n + " };" \n + " _handle = [] execVM format[""%1%2%3"",_preFix,_scriptName,_postFix];" \n " diag_log format[""DEBUG: _event %1"", _scriptName];" \n " };" \n "} forEach _events;" \n @@ -452,4 +458,4 @@ class FSM { }; }; -/*%FSM*/ +/*%FSM*/ \ No newline at end of file