mirror of
https://github.com/EpochModTeam/Epoch.git
synced 2024-08-30 18:22:13 +00:00
fix godmode with player vars
This commit is contained in:
parent
b76ec767c1
commit
bdb168ba50
@ -329,6 +329,17 @@ if !(EPOCH_ActiveTraderMission isequalto []) then {
|
|||||||
} foreach _taskDialogues;
|
} 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
|
// Update read only vars
|
||||||
if !(_playerTempKey isEqualTo "EPOCH_playerTemp") then {
|
if !(_playerTempKey isEqualTo "EPOCH_playerTemp") then {
|
||||||
EPOCH_playerTemp = missionNamespace getVariable [_playerTempKey, _playerTempDefault];
|
EPOCH_playerTemp = missionNamespace getVariable [_playerTempKey, _playerTempDefault];
|
||||||
|
@ -18,6 +18,7 @@ EPOCH_forceUpdateNow = false;
|
|||||||
_clientAliveTimer = diag_tickTime;
|
_clientAliveTimer = diag_tickTime;
|
||||||
|
|
||||||
// init player stat vars
|
// 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;
|
_customVarsInit = ["CfgEpochClient", "customVarsDefaults", EPOCH_customVarsDefaults] call EPOCH_fnc_returnConfigEntryV2;
|
||||||
_customVarNames = _customVarsInit apply {_x param [0,""]};
|
_customVarNames = _customVarsInit apply {_x param [0,""]};
|
||||||
_defaultVarValues = _customVarsInit apply {_x param [1,0]};
|
_defaultVarValues = _customVarsInit apply {_x param [1,0]};
|
||||||
|
@ -108,6 +108,8 @@ class CfgEpochClient
|
|||||||
{"Nuisance",0,{100,0}},
|
{"Nuisance",0,{100,0}},
|
||||||
{"MissionArray",{},{}}
|
{"MissionArray",{},{}}
|
||||||
};
|
};
|
||||||
|
// Vars that get reset to defaults if godmode is enabled
|
||||||
|
gmVars[] = {"Temp","Hunger","Thirst","Toxicity","Stamina","BloodP","Alcohol","Radiation"};
|
||||||
|
|
||||||
hudConfigs[] = {
|
hudConfigs[] = {
|
||||||
{{"BloodP","","",{"getPlayerDamage",">=",0.7}},"topRight","x\addons\a3_epoch_code\Data\UI\bleeding_ca.paa",{"forceUpdate"}},
|
{{"BloodP","","",{"getPlayerDamage",">=",0.7}},"topRight","x\addons\a3_epoch_code\Data\UI\bleeding_ca.paa",{"forceUpdate"}},
|
||||||
|
@ -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;
|
_skn_badAnimations = [_cfg_blacklistConfig, "animations", ['AmovPercMstpSnonWnonDnon_exerciseKata','AmovPercMstpSnonWnonDnon_exercisePushup','GestureSpasm1','GestureSpasm4','GestureNod']] call EPOCH_fnc_returnConfigEntry;
|
||||||
|
|
||||||
_cfg_variablesConfig = (_config >> "variables");
|
_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_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;
|
_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 setBleedingRemaining 0;
|
||||||
player setOxygenRemaining 1;
|
player setOxygenRemaining 1;
|
||||||
player allowDamage false;
|
player allowDamage false;
|
||||||
{
|
[true, {EPOCH_GMODE = _this}] remoteExec ['call', player];
|
||||||
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];
|
|
||||||
uiSleep 0.25;
|
uiSleep 0.25;
|
||||||
!"+_skn_tg_godMode+"
|
!"+_skn_tg_godMode+"
|
||||||
};
|
};
|
||||||
player allowDamage true;
|
player allowDamage true;
|
||||||
|
[nil, {EPOCH_GMODE = _this}] remoteExec ['call', player];
|
||||||
player setVariable ['EPOCH_gm_enabled',false,true];
|
player setVariable ['EPOCH_gm_enabled',false,true];
|
||||||
} else {
|
} else {
|
||||||
['God Mode',1] call "+_skn_adminLog_PVC+";
|
['God Mode',1] call "+_skn_adminLog_PVC+";
|
||||||
|
@ -87,7 +87,7 @@ class CfgSecConf
|
|||||||
class whitelist {
|
class whitelist {
|
||||||
#include "data\custom_vars.h" // whitelisted variables
|
#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"};
|
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"};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user