diff --git a/Server_Install_Pack/@epochhive/epochconfig.hpp b/Server_Install_Pack/@epochhive/epochconfig.hpp index 96fcd9e0..8e475289 100644 --- a/Server_Install_Pack/@epochhive/epochconfig.hpp +++ b/Server_Install_Pack/@epochhive/epochconfig.hpp @@ -12,15 +12,15 @@ 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 , 1, -1, {"VR"}}, // SECOND , EVENT , INIT 1 = run script at startup or 0 normal delay, PREPOSTFIX 1 = use pre/postfix path (inside epoch settings pbo) 0 = use full file path + { 3600, "CarnivalSpawner", 0 , 1, -1, {} ,{"VR"}}, // SECOND , EVENT , INIT 1 = run script at startup or 0 normal delay, PREPOSTFIX 1 = use pre/postfix path (inside epoch settings pbo) 0 = use full file path // { 1800, "PaydayEvent", 0, 1}, // { 1200, "MessageServer", 0, 1}, - { 2700, "AirDrop", 0 , 1, -1, {"VR"}}, - { 2400, "EarthQuake", 0 , 1, -1, {"VR"}}, - { 2700, "Satellite", 0 , 1, -1, {"VR"}}, - { 900, "ChangeWeather", 1 , 1, -1, {"VR"}}, - { 1200, "ContainerSpawner", 0 , 1, -1, {"VR"}}, - { 300, "PlantSpawner", 0 , 1 , -1, {"VR"}} //No comma on last Entry + { 2700, "AirDrop", 0 , 1, -1, {} ,{"VR"}}, + { 2400, "EarthQuake", 0 , 1, -1, {} ,{"VR"}}, + { 2700, "Satellite", 0 , 1, -1, {} ,{"VR"}}, + { 900, "ChangeWeather", 1 , 1, -1, {} ,{"VR"}}, + { 1200, "ContainerSpawner", 0 , 1, -1, {} ,{"VR"}}, + { 300, "PlantSpawner", 0 , 1 , -1, {} ,{"VR"}} //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 c4785a2b..5d0ff117 100644 --- a/Sources/epoch_server/system/server_monitor.fsm +++ b/Sources/epoch_server/system/server_monitor.fsm @@ -1,14 +1,14 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"Init",0,250,600.000000,-575.000000,700.000000,-525.000000,0.000000,"Init"}; +item0[] = {"Init",0,4346,600.000000,-575.000000,700.000000,-525.000000,0.000000,"Init"}; item1[] = {"_",8,218,600.000000,-500.000000,700.000000,-450.000000,0.000000,""}; item2[] = {"Process",2,250,600.000000,-350.000000,700.000000,-300.000000,0.000000,"Process"}; item3[] = {"Vehicle_and_Player",4,218,740.131958,-228.950928,840.131958,-178.950928,1.000000,"" \n "Vehicle and Player" \n "Checks"}; item4[] = {"CMD_queue",4,218,450.000000,-450.000000,550.000000,-400.000000,10.000000,"CMD queue"}; item5[] = {"Save_Players",4,218,450.000000,-375.000000,550.000000,-325.000000,3.000000,"Save" \n "Players"}; item6[] = {"Cleanup",4,218,750.000000,-375.000000,850.000000,-325.000000,8.000000,"Cleanup"}; -item7[] = {"Events_and_Resta",4,4314,450.000000,-225.000000,550.000000,-175.000000,0.000000,"Events" \n "and" \n "Restart"}; +item7[] = {"Events_and_Resta",4,218,450.000000,-225.000000,550.000000,-175.000000,0.000000,"Events" \n "and" \n "Restart"}; item8[] = {"Save_Vehicles",4,218,450.000000,-300.000000,550.000000,-250.000000,4.000000,"Save" \n "Vehicles"}; item9[] = {"Cleanup_Handler",4,218,750.000000,-450.000000,850.000000,-400.000000,8.000000,"Cleanup" \n "Handler"}; item10[] = {"Server_FPS",4,218,600.000000,-148.030182,700.000000,-98.030182,0.000000,"Server FPS"}; @@ -58,7 +58,7 @@ class FSM "// Load Epoch Events 3.0" \n "{" \n " diag_log format[""Loading Settings for %1 event..."",configName _x];" \n - " _events pushBack [getNumber (_x >> ""delay""),getText (_x >> ""script""),getNumber (_x >> ""runOnStart""),getNumber (_x >> ""usePrefix""),getNumber (_x >> ""runNumTimes""),getArray (_x >> ""disallowedWorlds"")];" \n + " _events pushBack [getNumber (_x >> ""delay""),getText (_x >> ""script""),getNumber (_x >> ""runOnStart""),getNumber (_x >> ""usePrefix""),getNumber (_x >> ""runNumTimes""),getArray (_x >> ""input""),getArray (_x >> ""disallowedWorlds"")];" \n "} forEach (""isClass _x"" configClasses (configFile >> ""CfgEpochServerEvents""));" \n "" \n "_cmdDelay = EPOCH_hiveAdminCmdTime;" \n