Merge pull request #569 from EpochModTeam/experimental

0.3.9 b561

Server_Install_Pack/@epochhive/epochconfig.hpp

@@ -28,7 +28,7 @@ antagonistChanceLoot = 0.09; //9% chance when player click "SEARCH" on a loot ob
 cloneCost = 100; // debt incurred on player death
 
 // vehicles - Max vehicle slots is calculated from per vehicle limits below. Warning! Higher the number lower the performance.
-simulationHandler = true; // When enabled this feature disables simulation on vehicles that are not nea players. Can help improve client fps at the cost of server fps.
+simulationHandlerOld = false; // When enabled this feature disables simulation on vehicles that are not nea players. Can help improve client fps at the cost of server fps.
 vehicleLockTime = 1800; // Controls how many seconds it takes to allow another person/group to unlock vehicle.
 
 // Traders

Server_Install_Pack/sc/BattlEye/scripts.txt

@@ -38,7 +38,7 @@
 7 createDialog !="createDialog \"rmx_dynamenu\";" !="createDialog \"rmx_craftingUI\";" !="createDialog \"QuickUpgrade\";" !="createDialog \"QuickTake\";" !="createDialog \"InteractBank\";" !="createdialog \"SelectGender\";" !="_handled = createdialog _dialog;" !="if !(createdialog \"InteractItem\") exitWith {};" !="createDialog _tapDiag;" !="if !(createdialog \"Trade\") exitWith {};" !="_ok = createdialog \"Interact\";" !="_ok = createdialog \"TradeNPCMenu\";" !="createDialog \"Epoch_myGroup\";" !="createDialog (if ((Epoch_my_GroupUID == \"\") && (Epoch_my_Group isEqualTo [])) then {\"EPOCH_createGrp\"} else {\"Epoch_myGroup\"});" !="createDialog \"GroupRequests\";" !="_ok = createdialog \"MissionSelect\";" !="createDialog 'Skaronator_AdminMenu';"
 7 createDisplay !="createDisplay \"rmx_dynamenu\";" !="_parent createdisplay _displayClass;" !="finddisplay 151 createdisplay 'RscDisplayOptionsLayout'"
 7 deleteMarker !="deleteMarkerLocal _mName;"
-7 setMarker !="CBA_fnc_setMarkerPersistent\"" !="\\fnc_setMarkerPersistent" !="\"setMarkerPersistent" !="_mrkr setMarkerShapeLocal _mShape;" != "_mrkr setMarkerTypeLocal _mType;"
+7 setMarker !="CBA_fnc_setMarkerPersistent\"" !="\\fnc_setMarkerPersistent" !="\"setMarkerPersistent" !="_mrkr setMarkerShapeLocal _mShape;" !="_mrkr setMarkerTypeLocal _mType;"
 7 createMarker !="CBA_fnc_createMarker\"" !="\\fnc_createMarker" !="\"createMarker" !="cba_fCreateMarker" !="createMarkerLocal [_mName, _mPos];"
 7 assignItem !="axeVIP assignItem _item;" !="unassignItem"
 7 forceAddUniform

Sources/epoch_code/compile/EPOCH_zombieSpawn.sqf

@@ -40,7 +40,7 @@ _unit switchMove "AmovPercMstpSnonWnonDnon_SaluteOut";
 [player, "AmovPercMstpSnonWnonDnon_SaluteOut", Epoch_personalToken, _unit] remoteExec ["EPOCH_server_handle_switchMove",2];
 
 _unit setmimic "dead";
-_unit setface (selectRandom ["RyanZombieFace1", "RyanZombieFace2", "RyanZombieFace3", "RyanZombieFace4", "RyanZombieFace5"]);
+// _unit setface (selectRandom ["RyanZombieFace1", "RyanZombieFace2", "RyanZombieFace3", "RyanZombieFace4", "RyanZombieFace5"]);
 removegoggles _unit;
 _zedHandle = [_unit,true] execFSM "epoch_code\system\EPOCH_zombie_brain.fsm";
 _unit addEventHandler ["FiredNear", "(_this select 0) setVariable [""zFiredNear"",[_this select 1, _this select 2]];"];

Sources/epoch_code/gui/scripts/dynamenu/Epoch_dynamicMenu.sqf

@@ -109,7 +109,7 @@ _checkConfigs = {
 						};
 
 						_tooltip = "";
-						_tooltipcode = getText(_x >> "tooltipcode"),;
+						_tooltipcode = getText(_x >> "tooltipcode");
 						if (_tooltipcode != "") then {
 							_tooltip = [] call compile _tooltipcode;
 						}

Sources/epoch_config/build.hpp

@@ -1 +1 @@
-build=560;
+build=561;

Sources/epoch_server/build.hpp

@@ -1 +1 @@
-build=560;
+build=561;

Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_vehicles.sqf

@@ -222,8 +222,8 @@ for "_i" from 1 to _maxVehicleLimit do {
 };
 
 // re-enable damage and apply to vehicles after we wait some time.
-[_vehicleDamages,([_serverSettingsConfig, "immuneVehicleSpawnTime", 120] call EPOCH_fnc_returnConfigEntry),([_serverSettingsConfig, "simulationHandler", true] call EPOCH_fnc_returnConfigEntry)] spawn {
-	params [["_vehicleDamages",[]],["_immuneTime",120],["_simulationHandler",true]];
+[_vehicleDamages,([_serverSettingsConfig, "immuneVehicleSpawnTime", 120] call EPOCH_fnc_returnConfigEntry),([_serverSettingsConfig, "simulationHandlerOld", false] call EPOCH_fnc_returnConfigEntry)] spawn {
+	params [["_vehicleDamages",[]],["_immuneTime",120],["_simulationHandler",false]];
 	// wait for some time to let all vehicles settle.
 	sleep _immuneTime;
 	// set final damages

Sources/epoch_server/system/server_monitor.fsm

@@ -50,7 +50,7 @@ class FSM
        "_serverSettingsConfig = configFile >> ""CfgEpochServer"";" \n
        "_ahInitAuthCfg = [_serverSettingsConfig, ""antihack_ahInitAuthCfg"", [0,180]] call EPOCH_fnc_returnConfigEntry;" \n
        "_events = [_serverSettingsConfig, ""events"", []] call EPOCH_fnc_returnConfigEntry;" \n
-       "_simulationHandler = [_serverSettingsConfig, ""simulationHandler"", true] call EPOCH_fnc_returnConfigEntry;" \n
+       "_simulationHandler = [_serverSettingsConfig, ""simulationHandlerOld"", false] call EPOCH_fnc_returnConfigEntry;" \n
        "" \n
        "_initAhInitBanOrLog = _ahInitAuthCfg select 0;" \n
        "_initTimeLimit = _ahInitAuthCfg select 1;" \n

Sources/epoch_server_core/build.hpp

@@ -1 +1 @@
-build=560;
+build=561;

Sources/epoch_server_settings/build.hpp

@@ -1 +1 @@
-build=560;
+build=561;

build.txt

@@ -1 +1 @@
-560
+561