Reveal objects rework (#603)

* Initial commit

* Player tag change

* Remove tabs

* Missing paycheck message

Co-authored-by: Jason_000 <Jason2605@users.noreply.github.com>

Author: DomT602

Altis_Life.Altis/config/Config_SpyGlass.hpp

@@ -323,7 +323,7 @@ class SpyGlass {
         { "luce_1", "SCRIPT" }, { "life_bail_amount", "SCALAR" }, { "life_canpay_bail", "BOOL" }, { "hc_life", "SCALAR" }, { "life_fnc_requestclientid", "OBJECT" }, { "life_hc_isactive", "BOOL" }, { "ton_fnc_playtime_values", "ARRAY" }, { "ton_fnc_playtime_values_request", "ARRAY" }, { "hc_1", "OBJECT" }, { "hc_life", "BOOL" }, { "rscdisplaympinterrupt_respawntime", "SCALAR" }, { "bis_dynamictext_spawn_8", "SCRIPT" },
         { "life_my_gang", "OBJECT" }, {"am_exit","SCALAR"}, { "life_garage_sp", "ARRAY" }, { "life_garage_sp", "STRING" }, { "0", "ARRAY" }, { "life_oldvestitems", "ARRAY" }, { "life_shop_cam", "OBJECT" }, { "life_oldclothes", "STRING" }, { "life_cmenu_lock", "BOOL" }, { "life_oldhat", "STRING" }, { "life_oldvest", "STRING" }, { "life_oldglasses", "STRING" }, { "life_oldbackpackitems","ARRAY"},
         {"life_oldbackpack","STRING"}, { "rscnotification_data", "ARRAY" }, { "life_curwep_h", "STRING" }, { "carshop_lux_1", "OBJECT" }, { "life_olduniformitems", "ARRAY" }, { "bis_fnc_setvehiclemass_fsm", "SCALAR" }, { "life_3dPreview_light", "OBJECT" }, { "life_3dPreview_camera", "OBJECT" }, { "life_3dPreview_object", "OBJECT" },
-        { "life_pos_attach", "ARRAY" }, { "life_inv_", "SCALAR" }, { "life_markers", "BOOL" }, { "life_markers_active", "BOOL" }, { "life_frozen", "BOOL" }, { "life_settings_revealobjects", "BOOL" }, { "life_inv_rooster", "SCALAR" }, { "station_shop_09", "OBJECT" }, { "station_shop_08", "OBJECT" }, { "station_shop_07", "OBJECT" }, { "station_shop_06", "OBJECT" }, { "station_shop_04", "OBJECT" }, { "life_disable_getout", "BOOL" },
+        { "life_pos_attach", "ARRAY" }, { "life_inv_", "SCALAR" }, { "life_markers", "BOOL" }, { "life_markers_active", "BOOL" }, { "life_frozen", "BOOL" }, { "life_inv_rooster", "SCALAR" }, { "station_shop_09", "OBJECT" }, { "station_shop_08", "OBJECT" }, { "station_shop_07", "OBJECT" }, { "station_shop_06", "OBJECT" }, { "station_shop_04", "OBJECT" }, { "life_disable_getout", "BOOL" },
         { "bis_taskenhancements_3d", "BOOL" }, { "life_settings_enablenewsbroadcast", "BOOL" }, { "life_settings_enablesidechannel", "BOOL" }, { "life_isknocked", "BOOL" }, { "life_settings_viewdistancecar", "SCALAR" }, { "life_save_gear", "ARRAY" }, { "life_settings_viewdistanceair", "SCALAR" }, { "life_disable_getin", "BOOL" }, { "life_god", "BOOL" }, { "station_shop_3", "OBJECT" }, { "station_shop_2", "OBJECT" },
         { "station_shop_1", "OBJECT" }, { "station_shop_24", "OBJECT" }, { "station_shop_23", "OBJECT" }, { "station_shop_22", "OBJECT" }, { "station_shop_21", "OBJECT" }, { "station_shop_20", "OBJECT" }, { "life_settings_viewdistancefoot", "SCALAR" }, { "life_settings_tagson", "BOOL" }, { "station_shop_19", "OBJECT" }, { "bis_taskenhancements_enable", "BOOL" }, { "station_shop_18", "OBJECT" }, { "station_shop_17", "OBJECT" },
         { "life_container_activeobj", "OBJECT" }, { "station_shop_16", "OBJECT" }, { "station_shop_15", "OBJECT" }, { "station_shop_14", "OBJECT" }, { "station_shop_13", "OBJECT" }, { "station_shop_12", "OBJECT" }, { "station_shop_11", "OBJECT" }, { "station_shop_10", "OBJECT" }, { "life_progress", "DISPLAY" }, { "life_veh_shop", "ARRAY" }, { "bis_fnc_feedback_deltadamage", "SCALAR" }, { "life_clothing_store", "STRING" },
@@ -351,7 +351,7 @@ class SpyGlass {
         { "db_async_active", "BOOL" }, { "life_removewanted", "BOOL" }, { "life_redgull_effect", "SCALAR" }, { "life_id_playertags", "STRING" }, { "life_delivery_in_progress", "BOOL" }, { "life_inv_ornate", "SCALAR" }, { "fed_bank", "OBJECT" }, { "bis_uncblur", "SCALAR" }, { "life_inv_tunaraw", "SCALAR" }, { "license_civ_medmarijuana", "BOOL" }, { "life_inv_mullet", "SCALAR" }, { "life_vdair", "SCALAR" },
         { "life_inv_diamondcut", "SCALAR" }, { "bis_suffblur", "SCALAR" }, { "license_civ_salt", "BOOL" }, { "life_carryweight", "SCALAR" }, { "life_server_isready", "BOOL" }, { "hq_lt_1", "OBJECT" }, { "life_inv_catsharkraw", "SCALAR" }, { "heroin_processor", "OBJECT" }, { "life_respawn_timer", "SCALAR" }, { "carshop1_2", "OBJECT" }, { "hq_desk_1", "OBJECT" }, { "carshop1_3", "OBJECT" },
         { "bis_blendcoloralpha", "SCALAR" }, { "life_vdcar", "SCALAR" }, { "db_async_extralock", "BOOL" }, { "life_clothing_purchase", "ARRAY" }, { "license_civ_driver", "BOOL" }, { "license_civ_ggst1", "BOOL" }, { "license_civ_ggst2", "BOOL" }, { "license_civ_ggst3", "BOOL" }, { "vhe_fnc_grua", "CODE" }, { "vhe_fnc_initgrua", "CODE" }, { "vhe_fnc_sirenasems", "CODE" }, { "vhe_fnc_sirenas", "CODE" }, { "reb_1_4", "OBJECT" },
-        { "ggs_shop", "OBJECT" }, { "reb_helicopter_1", "OBJECT" }, { "reb_helicopter_2", "OBJECT" }, { "life_inv_spikestrip", "SCALAR" }, { "license_civ_heroin", "BOOL" }, { "life_inv_waterbottle", "SCALAR" }, { "bis_oldlifestate", "STRING" }, { "life_inv_ornateraw", "SCALAR" }, { "life_id_revealobjects", "STRING" }, { "h1_3", "OBJECT" }, { "bis_pp_burnparams", "ARRAY" },
+        { "ggs_shop", "OBJECT" }, { "reb_helicopter_1", "OBJECT" }, { "reb_helicopter_2", "OBJECT" }, { "life_inv_spikestrip", "SCALAR" }, { "license_civ_heroin", "BOOL" }, { "life_inv_waterbottle", "SCALAR" }, { "bis_oldlifestate", "STRING" }, { "life_inv_ornateraw", "SCALAR" }, { "life_id_revealobjects", "SCALAR" }, { "life_id_playertags", "SCALAR" }, { "h1_3", "OBJECT" }, { "bis_pp_burnparams", "ARRAY" },
         { "life_session_completed", "BOOL" }, { "license_civ_gun", "BOOL" }, { "license_cop_cair", "BOOL" }, { "bis_stackedeventhandlers_oneachframe", "ARRAY" }, { "bis_teamswitched", "BOOL" }, { "life_inv_rabbitraw", "SCALAR" }, { "life_inv_defibrillator", "SCALAR" }, { "life_inv_toolkit", "SCALAR" }, { "life_gear", "ARRAY" }, { "life_istazed", "BOOL" }, { "life_net_dropped", "BOOL"},
         { "life_shop_npc", "OBJECT" }, { "life_shop_type", "STRING" }, { "life_deathcamera", "OBJECT" }, { "life_corpse", "OBJECT" }, { "life_admin_debug", "BOOL" }, { "bis_fnc_camera_target", "OBJECT" }, { "bis_fnc_camera_cam", "OBJECT" }, { "bis_fnc_camera_acctime", "SCALAR" }, { "bis_fnc_shownotification_process", "SCRIPT" }, { "bis_fnc_shownotification_counter", "SCALAR" }, { "bis_fnc_shownotification_queue", "ARRAY" },
         { "life_action_spikestrippickup", "SCALAR" }, { "life_container_active", "BOOL" }, { "life_cur_task", "TASK" }, { "life_cur_task", "OBJECT" }, { "life_enablenewsbroadcast", "BOOL" }, { "life_enablesidechannel", "BOOL" }, { "life_fed_scam", "OBJECT" }, { "life_coprecieve", "OBJECT" }, { "life_chopshop", "STRING" }, {"life_civ_position","ARRAY"}, {"life_is_alive","BOOL"}, {"finishedloop","BOOL"}, {"life_fnc_wantedcrimes","CODE"},

Altis_Life.Altis/core/configuration.sqf

@@ -47,8 +47,6 @@ life_firstSpawn = true;
 //Settings
 life_settings_enableNewsBroadcast = profileNamespace getVariable ["life_enableNewsBroadcast", true];
 life_settings_enableSidechannel = profileNamespace getVariable ["life_enableSidechannel", true];
-life_settings_tagson = profileNamespace getVariable ["life_settings_tagson", true];
-life_settings_revealObjects = profileNamespace getVariable ["life_settings_revealObjects", true];
 life_settings_viewDistanceFoot = profileNamespace getVariable ["life_viewDistanceFoot", 1250];
 life_settings_viewDistanceCar = profileNamespace getVariable ["life_viewDistanceCar", 1250];
 life_settings_viewDistanceAir = profileNamespace getVariable ["life_viewDistanceAir", 1250];

Altis_Life.Altis/core/fn_survival.sqf

@@ -59,6 +59,7 @@ private _fnc_paycheck = {
     } else {
         systemChat localize "STR_MissedPay";
     };
+    systemChat format [localize "STR_FSM_Paycheck",(getNumber(missionConfigFile >> "Life_Settings" >> "paycheck_period"))];
 };
 
 //Setup the time-based variables.

Altis_Life.Altis/core/functions/fn_playerTags.sqf

@@ -6,25 +6,23 @@
     Description:
     Adds the tags above other players heads when close and have visible range.
 */
-if (!life_settings_tagson) exitWith {};
-private ["_ui","_units","_masks"];
 #define iconID 78000
 #define scale 0.8
 
 if (visibleMap || {!alive player} || {dialog}) exitWith {
     500 cutText["","PLAIN"];
 };
 
-_ui = uiNamespace getVariable ["Life_HUD_nameTags",displayNull];
+private _ui = uiNamespace getVariable ["Life_HUD_nameTags",displayNull];
 if (isNull _ui) then {
     500 cutRsc["Life_HUD_nameTags","PLAIN"];
     _ui = uiNamespace getVariable ["Life_HUD_nameTags",displayNull];
 };
 
-_units = nearestObjects[(visiblePosition player),["CAManBase","Land_Pallet_MilBoxes_F","Land_Sink_F"],50];
+private _units = nearestObjects[(visiblePosition player),["CAManBase","Land_Pallet_MilBoxes_F","Land_Sink_F"],50];
 _units = _units - [player];
 
-_masks = LIFE_SETTINGS(getArray,"clothing_masks");
+private _masks = LIFE_SETTINGS(getArray,"clothing_masks");
 
 private _index = -1;
 {

Altis_Life.Altis/core/functions/fn_revealObjects.sqf

@@ -8,8 +8,6 @@
     
     Can be taxing on low-end systems or AMD CPU users.
 */
-if (!life_settings_revealObjects) exitWith {};
-
 private _objects = nearestObjects[visiblePositionASL player, ["Land_CargoBox_V1_F","Land_BottlePlastic_V1_F","Land_TacticalBacon_F","Land_Can_V3_F","Land_CanisterFuel_F","Land_Money_F","Land_Suitcase_F","CAManBase"], 15];
 {
     player reveal _x;

Altis_Life.Altis/core/init.sqf

@@ -76,8 +76,12 @@ diag_log "[Life Client] Past Settings Init";
 
 0 cutText ["","BLACK IN"];
 
-addMissionEventHandler ["EachFrame", life_fnc_playerTags];
-addMissionEventHandler ["EachFrame", life_fnc_revealObjects];
+if (profileNamespace getVariable ["life_settings_revealObjects",true]) then {
+    LIFE_ID_PlayerTags = addMissionEventHandler ["EachFrame", life_fnc_playerTags];
+};
+if (profileNamespace getVariable ["life_settings_revealObjects",true]) then {
+    LIFE_ID_RevealObjects = addMissionEventHandler ["EachFrame", life_fnc_revealObjects];
+};
 
 if (LIFE_SETTINGS(getNumber,"enable_fatigue") isEqualTo 0) then {player enableFatigue false;};
 if (LIFE_SETTINGS(getNumber,"pump_service") isEqualTo 1) then {

Altis_Life.Altis/core/pmenu/fn_s_onCheckedChange.sqf

@@ -6,30 +6,30 @@
     Description:
     Switching it up and making it prettier..
 */
-private ["_option","_state"];
-_option = _this select 0;
-_state = _this select 1;
+params [
+    ["_option","",[""]],
+    ["_state",0,[0]]
+];
+if (_option isEqualTo "") exitWith {};
 
-switch (_option) do {
+switch _option do {
     case "tags": {
         if (_state isEqualTo 1) then {
-            life_settings_tagson = true;
             profileNamespace setVariable ["life_settings_tagson",true];
+            LIFE_ID_PlayerTags = addMissionEventHandler ["EachFrame", life_fnc_playerTags];
         } else {
-            life_settings_tagson = false;
             profileNamespace setVariable ["life_settings_tagson",false];
+            removeMissionEventHandler ["EachFrame",LIFE_ID_PlayerTags];
         };
     };
 
     case "objects": {
         if (_state isEqualTo 1) then {
-            life_settings_revealObjects = true;
             profileNamespace setVariable ["life_settings_revealObjects",true];
-            LIFE_ID_RevealObjects = ["LIFE_RevealObjects","onEachFrame","life_fnc_revealObjects"] call BIS_fnc_addStackedEventHandler;
+            LIFE_ID_RevealObjects = addMissionEventHandler ["EachFrame", life_fnc_revealObjects];
         } else {
-            life_settings_revealObjects = false;
             profileNamespace setVariable ["life_settings_revealObjects",false];
-            [LIFE_ID_RevealObjects,"onEachFrame"] call BIS_fnc_removeStackedEventHandler;
+            removeMissionEventHandler ["EachFrame",LIFE_ID_RevealObjects];
         };
     };
 

Altis_Life.Altis/core/pmenu/fn_settingsMenu.sqf

@@ -24,14 +24,12 @@ ctrlSetText[2922, format ["%1", life_settings_viewDistanceAir]];
 } forEach [[2901,life_settings_viewDistanceFoot],[2911,life_settings_viewDistanceCar],[2921,life_settings_viewDistanceAir]];
 
 
-if (isNil "life_settings_revealObjects") then {
+if (isNil "life_settings_enableNewsBroadcast") then {
     life_settings_enableNewsBroadcast = profileNamespace setVariable ["life_enableNewsBroadcast",true];
     life_settings_enableSidechannel = profileNamespace setVariable ["life_enableSidechannel",true];
-    life_settings_tagson = profileNamespace setVariable ["life_settings_tagson",true];
-    life_settings_revealObjects = profileNamespace setVariable ["life_settings_revealObjects",true];
 };
 
 CONTROL(2900,2971) cbSetChecked life_settings_enableSidechannel;
 CONTROL(2900,2973) cbSetChecked life_settings_enableNewsBroadcast;
-CONTROL(2900,2970) cbSetChecked life_settings_tagson;
-CONTROL(2900,2972) cbSetChecked life_settings_revealObjects;
+CONTROL(2900,2970) cbSetChecked (profileNamespace getVariable ["life_settings_tagson",true]);
+CONTROL(2900,2972) cbSetChecked (profileNamespace getVariable ["life_settings_revealObjects",true]);