diff --git a/Server_Install_Pack/sc/BattlEye/addbackpackcargo.txt b/Server_Install_Pack/sc/battleye_oem/addbackpackcargo.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/addbackpackcargo.txt rename to Server_Install_Pack/sc/battleye_oem/addbackpackcargo.txt diff --git a/Server_Install_Pack/sc/BattlEye/addmagazinecargo.txt b/Server_Install_Pack/sc/battleye_oem/addmagazinecargo.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/addmagazinecargo.txt rename to Server_Install_Pack/sc/battleye_oem/addmagazinecargo.txt diff --git a/Server_Install_Pack/sc/BattlEye/addweaponcargo.txt b/Server_Install_Pack/sc/battleye_oem/addweaponcargo.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/addweaponcargo.txt rename to Server_Install_Pack/sc/battleye_oem/addweaponcargo.txt diff --git a/Server_Install_Pack/sc/BattlEye/attachto.txt b/Server_Install_Pack/sc/battleye_oem/attachto.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/attachto.txt rename to Server_Install_Pack/sc/battleye_oem/attachto.txt diff --git a/Server_Install_Pack/sc/BattlEye/createvehicle.txt b/Server_Install_Pack/sc/battleye_oem/createvehicle.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/createvehicle.txt rename to Server_Install_Pack/sc/battleye_oem/createvehicle.txt diff --git a/Server_Install_Pack/sc/BattlEye/deleteVehicle.txt b/Server_Install_Pack/sc/battleye_oem/deleteVehicle.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/deleteVehicle.txt rename to Server_Install_Pack/sc/battleye_oem/deleteVehicle.txt diff --git a/Server_Install_Pack/sc/BattlEye/example-beserver.cfg b/Server_Install_Pack/sc/battleye_oem/example-beserver.cfg similarity index 100% rename from Server_Install_Pack/sc/BattlEye/example-beserver.cfg rename to Server_Install_Pack/sc/battleye_oem/example-beserver.cfg diff --git a/Server_Install_Pack/sc/battleye/example-beserver_x64.cfg b/Server_Install_Pack/sc/battleye_oem/example-beserver_x64.cfg similarity index 100% rename from Server_Install_Pack/sc/battleye/example-beserver_x64.cfg rename to Server_Install_Pack/sc/battleye_oem/example-beserver_x64.cfg diff --git a/Server_Install_Pack/sc/BattlEye/mpeventhandler.txt b/Server_Install_Pack/sc/battleye_oem/mpeventhandler.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/mpeventhandler.txt rename to Server_Install_Pack/sc/battleye_oem/mpeventhandler.txt diff --git a/Server_Install_Pack/sc/BattlEye/publicvariable.txt b/Server_Install_Pack/sc/battleye_oem/publicvariable.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/publicvariable.txt rename to Server_Install_Pack/sc/battleye_oem/publicvariable.txt diff --git a/Server_Install_Pack/sc/BattlEye/publicvariableval.txt b/Server_Install_Pack/sc/battleye_oem/publicvariableval.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/publicvariableval.txt rename to Server_Install_Pack/sc/battleye_oem/publicvariableval.txt diff --git a/Server_Install_Pack/sc/BattlEye/remotecontrol.txt b/Server_Install_Pack/sc/battleye_oem/remotecontrol.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/remotecontrol.txt rename to Server_Install_Pack/sc/battleye_oem/remotecontrol.txt diff --git a/Server_Install_Pack/sc/BattlEye/remoteexec.txt b/Server_Install_Pack/sc/battleye_oem/remoteexec.txt similarity index 90% rename from Server_Install_Pack/sc/BattlEye/remoteexec.txt rename to Server_Install_Pack/sc/battleye_oem/remoteexec.txt index 0e7eb45c..f50126f2 100644 --- a/Server_Install_Pack/sc/BattlEye/remoteexec.txt +++ b/Server_Install_Pack/sc/battleye_oem/remoteexec.txt @@ -1 +1 @@ -5 "" !="bis_fnc_execvm \[\[.+\],\"initPlayerServer.sqf\"]" !="bis_fnc_effectkilled(airdestruction|secondaries) \[.+\]" !="epoch_server_checkplayer \[[A-Z]{1} [A-Za-z]{4,10} [0-9]{1,3}-[0-9]{1,3}:[0-9]{1,3}( \(.+\)|) REMOTE\]" !="epoch_server_(save(_vehicles|building)|(lock|pack)Storage|(upgrade|remove|paint|maint)build) \[.+\]" !="epoch_server_((load|respawn|dead|invite|revive|teleport)Player|(upgrade|updateplayer|create|delete)Group) \[.+\]" !="epoch_server_(deadplayerdetonate|triggerantagonist|playersetvariable|missioncomms|make(marker|SP)|removemarker) \[.+\]" !="epoch_server_(knockDownTree|mineRocks|lootAnimal|handle_(say3d|switchmove|sapperObjs)) \[.+\]" !="epoch_server_((repair|fill|lock)Vehicle|(loot|fill)Container|(store|take)Crypto|make(NPC|)Trade) \[.+\]" !="epoch_server_(paycrypto|tradeRequest|equippeditem|packJack|create(object|AirDrop)|airDropCrate|destroytrash|unpackBackpack) \[.+\]" !="epoch_(localcleanup|fnc_saveplayer|client_bitePlayer|serverlootobject) \[.+\]" !="cup_fnc_handletow \[.+\]" +5 "" !="bis_fnc_execvm \[\[.+\],\"initPlayerServer.sqf\"]" !="bis_fnc_effectkilled(airdestruction|secondaries) \[.+\]" !="epoch_server_checkplayer \[[A-Z]{1} [A-Za-z]{4,10} [0-9]{1,3}-[0-9]{1,3}:[0-9]{1,3}( \(.+\)|) REMOTE\]" !="epoch_server_(save(_vehicles|building)|(lock|pack)Storage|(upgrade|remove|paint|maint)build) \[.+\]" !="epoch_server_((load|respawn|dead|invite|revive|teleport)Player|(upgrade|updateplayer|create|delete)Group) \[.+\]" !="epoch_server_(deadplayerdetonate|triggerantagonist|playersetvariable|missioncomms|make(marker|SP)|removemarker) \[.+\]" !="epoch_server_(knockDownTree|mineRocks|lootAnimal|handle_(say3d|switchmove|sapperObjs)) \[.+\]" !="epoch_server_((repair|fill|lock)Vehicle|(loot|fill)Container|(store|take)Crypto|make(NPC|)Trade) \[.+\]" !="epoch_server_(paycrypto|tradeRequest|equippeditem|packJack|create(object|AirDrop)|airDropCrate|destroytrash|unpackBackpack) \[.+\]" !="epoch_(localcleanup|fnc_saveplayer|client_bitePlayer|serverlootobject) \[.+\]" !="cup_fnc_handletow \[.+\]" !="bis_fnc_reviveinitaddplayer \[.+\]" diff --git a/Server_Install_Pack/sc/BattlEye/scripts.txt b/Server_Install_Pack/sc/battleye_oem/scripts.txt similarity index 98% rename from Server_Install_Pack/sc/BattlEye/scripts.txt rename to Server_Install_Pack/sc/battleye_oem/scripts.txt index eb36c967..3b002b7d 100644 --- a/Server_Install_Pack/sc/BattlEye/scripts.txt +++ b/Server_Install_Pack/sc/battleye_oem/scripts.txt @@ -46,9 +46,9 @@ 7 displaySetEventHandler 7 ctrlSetEventHandler !="_ctrlButtonOK ctrlseteventhandler [\"buttonclick\"," !="ctrlSetEventHandler ['LBDblClick', '_this call" !="_buttonRespawn ctrlseteventhandler [\"buttonclick\",\"with uinamespace do {['buttonRespawn'," !="_ctrl ctrlSetEventHandler [\"mouseEnter\"" !="_ctrlBtn ctrlSetEventHandler [\"MouseButtonDblClick\", _verAct];" !="_button_gen ctrlSetEventHandler [\"ButtonClick\",_btn_code + \"(uiNamespace getVariable [\"" 7 addMPEventHandler -7 addEventHandler !"displayAddEventHandler" !"ctrlAddEventHandler" !="player addeventhandler [\"PostReset\",{BIS_EnginePPReset = true;} ];" !="player addEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" !="\"CBA_fnc_addEventHandler\"" !="\\fnc_addEventHandler" !="\"addEventHandler" !="_eventFunc = _eventFunc + \"(_this select 0) addEventHandler ['Respawn', \" + str _eventFunc + \"];\";" !="_unit addEventHandler [\"hitpart\"," !="CBA_fnc_addEventHandler" !="_unit addEventHandler [_x, format ['call cba_xeh_fnc_%1', _x]];" !="_ship addEventHandler [\"AttributesChanged3DEN\"" !="addEventHandler [\"HandleDamage\",bis_fnc_reviveOnPlayerHandleDamage];" !="_unit addEventHandler [\"FiredNear\"" !="_smokeEH = _plyr addEventHandler [\"FiredNear\", \"airDropHandle setFSMVariable" !="_onContactEH = _currentTarget addEventHandler[\"EpeContactStart"" +7 addEventHandler !"displayAddEventHandler" !"ctrlAddEventHandler" !="player addeventhandler [\"PostReset\",{BIS_EnginePPReset = true;} ];" !="player addEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" !="\"CBA_fnc_addEventHandler\"" !="\\fnc_addEventHandler" !="\"addEventHandler" !="_eventFunc = _eventFunc + \"(_this select 0) addEventHandler ['Respawn', \" + str _eventFunc + \"];\";" !="_unit addEventHandler [\"hitpart\"," !="CBA_fnc_addEventHandler" !="_unit addEventHandler [_x, format ['call cba_xeh_fnc_%1', _x]];" !="_ship addEventHandler [\"AttributesChanged3DEN\"" !="addEventHandler [\"HandleDamage\",bis_fnc_reviveOnPlayerHandleDamage];" !="_unit addEventHandler [\"FiredNear\"" !="_smokeEH = _plyr addEventHandler [\"FiredNear\", \"airDropHandle setFSMVariable" !="_onContactEH = _currentTarget addEventHandler[\"EpeContactStart"" !="_object addeventhandler [\"local\",{[[_this select 0],\"bis_fnc_objectVar\"" 7 displayAddEventHandler !="(findDisplay 46) displayAddEventHandler [\"KeyDown\",\"true\"];" !="displayAddEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" !="_display displayaddeventhandler\n[\n\"mousemoving\"," !="_display displayaddeventhandler [\"unload\",\"uinamespace setvariable ['BIS_fnc_guiMess" !="findDisplay -1337 displayAddEventHandler ['Unload'" !="_display displayaddeventhandler [\"keydown\",\"with uinamespace do {['keyDown'" !="_display displayaddeventhandler [_x,_fnc_animate];" !="Development\") then\n{\n_display displayaddeventhandler [\n\"keydown\"" !="CBA_fnc_addDisplayHandler" !="_display displayAddEventHandler [\"MouseMoving" !="private _handler = _display displayAddEventHandler [_key, _code];" !="_display displayAddEventHandler [\"KeyDown\", \"_this call cba_keybinding_fnc_onKeyDown\"" -7 ctrlAddEventHandler !="_control = _display displayctrl 37305; \n_control ctrladdeventhandler" !="_ctrlMap = _display displayctrl 101;\n_ctrlMap ctrladdeventhandler" !="_display displayctrl 21995;\n_assetsButton ctrladdeventhandler [\"buttonclick\"," !="_display displayctrl 2406; \n_control ctrladdeventhandler [\"buttonclick\"," !="_display displayctrl 2400;\n_control ctrladdeventhandler [\"buttonclick\"," !="_ctrlTags ctrladdeventhandler [\"lbselchanged\"," !="_ButtonGeneral ctrladdeventhandler [\"buttonclick\"," !="_ctrlExecuteLocal ctrladdeventhandler [\"buttonclick\"," !="_bg ctrlAddEventHandler [\"MouseEnter\"," !="_container ctrlAddEventHandler [\"LBDblClick\",\"_this call EPOCH_itemInteractClick\"];" !="(uiNamespace getVariable 'ESP_map') ctrlAddEventHandler['Draw', '_esp_targets = EPOCH_ESPMAP_TARGETS;" !="ctrlAddEventHandler ['MouseButtonDown'" !="(_display displayctrl _idc) ctrlAddEventHandler [\"LBSelChanged\"," !="_ctrl ctrlSetEventHandler [\"mouseEnter\", (format [\"_c = _this select 0;" !="_ctrl ctrlSetEventHandler [\"mouseExit\", (format [\"_c = _this select 0;" !="_ctrl ctrlSetEventHandler [\"mouseButtonDown\", (format [\"call %1;\",(_buttonSettings select _e select 2)])];" !="_prevButton ctrlAddEventHandler [\"MouseButtonUp\", {_this call cba_diagnostic_fnc_debug" !="BIS_RscRespawnControlsMap_ctrlHeaderRespawnButton ctrlAddEventhandler [\"ButtonDown\"" !="_control = _display displayctrl 105;\n_control ctrladdeventhandler [\"MouseButtonUp\"" +7 ctrlAddEventHandler !="_control = _display displayctrl 37305; \n_control ctrladdeventhandler" !="_ctrlMap = _display displayctrl 101;\n_ctrlMap ctrladdeventhandler" !="_display displayctrl 21995;\n_assetsButton ctrladdeventhandler [\"buttonclick\"," !="_display displayctrl 2406; \n_control ctrladdeventhandler [\"buttonclick\"," !="_display displayctrl 2400;\n_control ctrladdeventhandler [\"buttonclick\"," !="_ctrlTags ctrladdeventhandler [\"lbselchanged\"," !="_ButtonGeneral ctrladdeventhandler [\"buttonclick\"," !="_ctrlExecuteLocal ctrladdeventhandler [\"buttonclick\"," !="_bg ctrlAddEventHandler [\"MouseEnter\"," !="_container ctrlAddEventHandler [\"LBDblClick\",\"_this call EPOCH_itemInteractClick\"];" !="(uiNamespace getVariable 'ESP_map') ctrlAddEventHandler['Draw', '_esp_targets = EPOCH_ESPMAP_TARGETS;" !="ctrlAddEventHandler ['MouseButtonDown'" !="(_display displayctrl _idc) ctrlAddEventHandler [\"LBSelChanged\"," !="_ctrl ctrlSetEventHandler [\"mouseEnter\", (format [\"_c = _this select 0;" !="_ctrl ctrlSetEventHandler [\"mouseExit\", (format [\"_c = _this select 0;" !="_ctrl ctrlSetEventHandler [\"mouseButtonDown\", (format [\"call %1;\",(_buttonSettings select _e select 2)])];" !="_prevButton ctrlAddEventHandler [\"MouseButtonUp\", {_this call cba_diagnostic_fnc_debug" !="BIS_RscRespawnControlsMap_ctrlHeaderRespawnButton ctrlAddEventhandler [\"ButtonDown\"" !="_control = _display displayctrl 105;\n_control ctrladdeventhandler [\"MouseButtonUp\"" !="_ctrlAddonList ctrlAddEventHandler [\"LBSelChanged\", cba_settings_fnc_gui_addonChanged];" 7 removeAllEventHandlers !"ctrlRemoveAllEventHandlers" !"displayRemoveAllEventHandlers" !="_vehicle removeAllEventHandlers \"GetOut\";" !="_sapper removeAllEventHandlers \"Hit\";\n_sapper removeAllEventHandlers \"FiredNear\";" !="_unit removeAllEventHandlers \"Hit\";\n_unit removeAllEventHandlers \"FiredNear\";" !="{_ship removeAllEventHandlers _x;} forEach [\"AttributesChanged3DEN\"" !="_zombie removeAllEventHandlers \"Hit\";" !="_zombie removeAllEventHandlers \"FiredNear\";" 7 displayRemoveAllEventHandlers !="_display displayRemoveAllEventHandlers _x;" !="if !(isMultiplayer) then { { (findDisplay 46) displayRemoveAllEventHandlers _x } forEach [\"KeyUp\", \"KeyDown\"] };" 7 removeAllMissionEventHandlers diff --git a/Server_Install_Pack/sc/BattlEye/selectplayer.txt b/Server_Install_Pack/sc/battleye_oem/selectplayer.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/selectplayer.txt rename to Server_Install_Pack/sc/battleye_oem/selectplayer.txt diff --git a/Server_Install_Pack/sc/BattlEye/setdamage.txt b/Server_Install_Pack/sc/battleye_oem/setdamage.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/setdamage.txt rename to Server_Install_Pack/sc/battleye_oem/setdamage.txt diff --git a/Server_Install_Pack/sc/BattlEye/setpos.txt b/Server_Install_Pack/sc/battleye_oem/setpos.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/setpos.txt rename to Server_Install_Pack/sc/battleye_oem/setpos.txt diff --git a/Server_Install_Pack/sc/BattlEye/setvariable.txt b/Server_Install_Pack/sc/battleye_oem/setvariable.txt similarity index 57% rename from Server_Install_Pack/sc/BattlEye/setvariable.txt rename to Server_Install_Pack/sc/battleye_oem/setvariable.txt index 9cc12cae..dee38842 100644 --- a/Server_Install_Pack/sc/BattlEye/setvariable.txt +++ b/Server_Install_Pack/sc/battleye_oem/setvariable.txt @@ -1 +1 @@ -5 "" !=(traderName|Offer|Accept|BUILD_SLOT|TRADE_ACTIVE|last_targeter|epoch_(antagobj|antagBomb|gm_enabled)) !="bis_fnc_objectvar_var" !="bis_fnc_selectrespawntemplate_respawned" !="cup_tow_towedveh" +5 "" !=(traderName|Offer|Accept|BUILD_SLOT|TRADE_ACTIVE|last_targeter|epoch_(antagobj|antagBomb|gm_enabled)) !="bis_fnc_objectvar_var" !="bis_fnc_selectrespawntemplate_respawned" !="#(rev_enabled|var)" !="cup_tow_towedveh" diff --git a/Server_Install_Pack/sc/BattlEye/setvariableval.txt b/Server_Install_Pack/sc/battleye_oem/setvariableval.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/setvariableval.txt rename to Server_Install_Pack/sc/battleye_oem/setvariableval.txt diff --git a/Server_Install_Pack/sc/BattlEye/teamswitch.txt b/Server_Install_Pack/sc/battleye_oem/teamswitch.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/teamswitch.txt rename to Server_Install_Pack/sc/battleye_oem/teamswitch.txt diff --git a/Server_Install_Pack/sc/BattlEye/waypointcondition.txt b/Server_Install_Pack/sc/battleye_oem/waypointcondition.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/waypointcondition.txt rename to Server_Install_Pack/sc/battleye_oem/waypointcondition.txt diff --git a/Server_Install_Pack/sc/BattlEye/waypointstatement.txt b/Server_Install_Pack/sc/battleye_oem/waypointstatement.txt similarity index 100% rename from Server_Install_Pack/sc/BattlEye/waypointstatement.txt rename to Server_Install_Pack/sc/battleye_oem/waypointstatement.txt diff --git a/Sources/epoch_config/Configs/CfgRemoteExec.hpp b/Sources/epoch_config/Configs/CfgRemoteExec.hpp index e79ff538..99bbfa24 100644 --- a/Sources/epoch_config/Configs/CfgRemoteExec.hpp +++ b/Sources/epoch_config/Configs/CfgRemoteExec.hpp @@ -26,6 +26,11 @@ class CfgRemoteExec { mode = 1; jip = 0; + class bis_fnc_reviveinitaddplayer + { + allowedTargets = 2; + jip = 0; + }; class EPOCH_server_paycrypto { allowedTargets = 2; diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf index 3aa61ea0..b7182976 100644 --- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf +++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf @@ -316,6 +316,12 @@ if (!isNull _player) then { //diag_log format["DEBUG (Load Player) Sent Group: %1 %2", _playerGroup, _playerGroupArray]; _newPlyr setVariable["SETUP", true, true]; + + // revive + _newPlyr setVariable ['#rev_enabled', true, true]; + + // [] remoteExec ["bis_fnc_reviveInit",_player]; + }; } else { diag_log format["LOGIN FAILED UNIT NULL: %1 [%2|%3]", _player, _group, count allgroups];