Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix godmode with player vars

Browse Source
This commit is contained in:
vbawol 2017-10-06 21:17:14 -05:00
parent b76ec767c1
commit bdb168ba50
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Sources/epoch_code/compile/setup/masterLoop/Event1.sqf
View File

@ -329,6 +329,17 @@ if !(EPOCH_ActiveTraderMission isequalto []) then {
} foreach _taskDialogues;
};
// AH use only
if !(isNil "EPOCH_GMODE") then {
{
_varDefault = _defaultVarValues select _foreachindex;
_varName = format["EPOCH_player%1",_x];
_varNameTmp = call compile format["_player%1Key",_x];
if !(isNil "_varNameTmp") then {_varName = _varNameTmp};
missionNamespace setVariable [_varName, _varDefault];
} forEach _gmVars;
};
// Update read only vars
if !(_playerTempKey isEqualTo "EPOCH_playerTemp") then {
EPOCH_playerTemp = missionNamespace getVariable [_playerTempKey, _playerTempDefault];

1
Sources/epoch_code/compile/setup/masterLoop/init.sqf
View File

@ -18,6 +18,7 @@ EPOCH_forceUpdateNow = false;
_clientAliveTimer = diag_tickTime;
// init player stat vars
_gmVars = ["CfgEpochClient", "gmVars", ["Temp","Hunger","Thirst","Toxicity","Stamina","BloodP","Alcohol","Radiation"]] call EPOCH_fnc_returnConfigEntryV2;
_customVarsInit = ["CfgEpochClient", "customVarsDefaults", EPOCH_customVarsDefaults] call EPOCH_fnc_returnConfigEntryV2;
_customVarNames = _customVarsInit apply {_x param [0,""]};
_defaultVarValues = _customVarsInit apply {_x param [1,0]};

2
Sources/epoch_config/Configs/CfgEpochClient.hpp
View File

@ -108,6 +108,8 @@ class CfgEpochClient
{"Nuisance",0,{100,0}},
{"MissionArray",{},{}}
};
// Vars that get reset to defaults if godmode is enabled
gmVars[] = {"Temp","Hunger","Thirst","Toxicity","Stamina","BloodP","Alcohol","Radiation"};
hudConfigs[] = {
{{"BloodP","","",{"getPlayerDamage",">=",0.7}},"topRight","x\addons\a3_epoch_code\Data\UI\bleeding_ca.paa",{"forceUpdate"}},

8
Sources/epoch_server/init/server_securityfunctions.sqf
View File

@ -47,7 +47,7 @@ _skn_badDisplaysArray = [_cfg_blacklistConfig, "badDisplays", [-1337,17,19,30,32
_skn_badAnimations = [_cfg_blacklistConfig, "animations", ['AmovPercMstpSnonWnonDnon_exerciseKata','AmovPercMstpSnonWnonDnon_exercisePushup','GestureSpasm1','GestureSpasm4','GestureNod']] call EPOCH_fnc_returnConfigEntry;
_cfg_variablesConfig = (_config >> "variables");
_skn_badVarCheckArray = [_cfg_variablesConfig, "badVars", ['ESP_map','ESP_mainMap','ESP_adminMap','AntiAntiAntiAntiHax','fnc_usec_damageHandler','fnc_usec_unconscious','VAGINA_secret','yolo','VERSION','life_fnc_handleDamage','EPOCH_spawnVehicle_PVS','CLASS911_Menu','nuke_vars','JJMMEE_INIT_MENU','PLAYERON','PLAYERNEXT2','ALTISLIFEON','LY_Menu','PLAY','LY_SwaggerLikeUs','BIS_fnc_dbg_reminder_value','BIS_fnc_dbg_reminder']] call EPOCH_fnc_returnConfigEntry;
_skn_badVarCheckArray = [_cfg_variablesConfig, "badVars", ['EPOCH_GMODE','ESP_map','ESP_mainMap','ESP_adminMap','AntiAntiAntiAntiHax','fnc_usec_damageHandler','fnc_usec_unconscious','VAGINA_secret','yolo','VERSION','life_fnc_handleDamage','EPOCH_spawnVehicle_PVS','CLASS911_Menu','nuke_vars','JJMMEE_INIT_MENU','PLAYERON','PLAYERNEXT2','ALTISLIFEON','LY_Menu','PLAY','LY_SwaggerLikeUs','BIS_fnc_dbg_reminder_value','BIS_fnc_dbg_reminder']] call EPOCH_fnc_returnConfigEntry;
_skn_nilVarCheckArray = [_cfg_variablesConfig, "nilVars", ['EPOCH_antiWallCount','EPOCH_playerEnergy','EPOCH_playerHunger','EPOCH_playerStamina','EPOCH_playerCrypto','EPOCH_target','EPOCH_ESP_TARGETS','EPOCH_ESPMAP_TARGETS','EPOCH_taxRate','EPOCH_ESP_VEHICLEPLAYER','EPOCH_ESP_PLAYER','EPOCH_ESP_VEHICLES']] call EPOCH_fnc_returnConfigEntry;
_skn_commandMenuArray = [(_config >> "commandMenu"), "menus",['','RscSelectTeam','RscTeam','RscMoveHigh','#GETIN','#RscStatus','#WATCH0','RscCombatMode','RscMenuReply','RscCallSupport','#CUSTOM_RADIO','#User:BIS_fnc_addCommMenuItem_menu','RscRadio','RscReply','#ACTION','RscMenuFormations','#WATCH','RscGroupRootMenu','RscMainMenu','RscMenuMove','RscWatchDir','RscWatchMoveDir','#User:BIS_Menu_GroupCommunication','RscMenuStatus','RscFormations']] call EPOCH_fnc_returnConfigEntry;
@ -1434,14 +1434,12 @@ _skn_admincode = compileFinal ("
player setBleedingRemaining 0;
player setOxygenRemaining 1;
player allowDamage false;
{
missionNamespace setVariable[format['EPOCH_player%1', _x], EPOCH_defaultVars select(EPOCH_customVars find _x)]
} forEach['Temp','Hunger','Thirst','Toxicity','Stamina','BloodP'];
EPOCH_playerEnergy = missionNamespace getVariable ['EPOCH_playerEnergyMax', 2500];
[true, {EPOCH_GMODE = _this}] remoteExec ['call', player];
uiSleep 0.25;
!"+_skn_tg_godMode+"
};
player allowDamage true;
[nil, {EPOCH_GMODE = _this}] remoteExec ['call', player];
player setVariable ['EPOCH_gm_enabled',false,true];
} else {
['God Mode',1] call "+_skn_adminLog_PVC+";

2
Sources/epoch_server_settings/configs/security/security_checks.h
View File

@ -87,7 +87,7 @@ class CfgSecConf
class whitelist {
#include "data\custom_vars.h" // whitelisted variables
};
badVars[] = {"ESP_map","ESP_mainMap","ESP_adminMap","AntiAntiAntiAntiHax","fnc_usec_damageHandler","fnc_usec_unconscious","VAGINA_secret","yolo","VERSION","life_fnc_handleDamage","EPOCH_spawnVehicle_PVS","CLASS911_Menu","nuke_vars","JJMMEE_INIT_MENU","PLAYERON","PLAYERNEXT2","ALTISLIFEON","LY_Menu","PLAY","LY_SwaggerLikeUs","BIS_fnc_dbg_reminder_value","BIS_fnc_dbg_reminder"};
badVars[] = {"EPOCH_GMODE","ESP_map","ESP_mainMap","ESP_adminMap","AntiAntiAntiAntiHax","fnc_usec_damageHandler","fnc_usec_unconscious","VAGINA_secret","yolo","VERSION","life_fnc_handleDamage","EPOCH_spawnVehicle_PVS","CLASS911_Menu","nuke_vars","JJMMEE_INIT_MENU","PLAYERON","PLAYERNEXT2","ALTISLIFEON","LY_Menu","PLAY","LY_SwaggerLikeUs","BIS_fnc_dbg_reminder_value","BIS_fnc_dbg_reminder"};
nilVars[] = {"EPOCH_antiWallCount","EPOCH_playerEnergy","EPOCH_playerHunger","EPOCH_playerStamina","EPOCH_playerCrypto","EPOCH_target","EPOCH_ESP_TARGETS","EPOCH_ESPMAP_TARGETS","EPOCH_taxRate","EPOCH_ESP_VEHICLEPLAYER","EPOCH_ESP_PLAYER","EPOCH_ESP_VEHICLES"};
};