Merge remote-tracking branch 'upstream/master'

Author: Casperento

Altis_Life.Altis/CfgRemoteExec.hpp

@@ -68,12 +68,12 @@ class CfgRemoteExec {
         F(SOCK_fnc_insertPlayerInfo,CLIENT)
         F(SOCK_fnc_requestReceived,CLIENT)
         F(SOCK_fnc_updateRequest,CLIENT)
-        F(TON_fnc_clientGangKick,CLIENT)
-        F(TON_fnc_clientGangLeader,CLIENT)
-        F(TON_fnc_clientGangLeft,CLIENT)
+        F(life_fnc_clientGangKick,CLIENT)
+        JIP(life_fnc_clientGangLeader,CLIENT)
+        F(life_fnc_clientGangLeft,CLIENT)
         F(TON_fnc_clientGetKey,CLIENT)
-        F(TON_fnc_clientMessage,CLIENT)
-        F(TON_fnc_player_query,CLIENT)
+        F(life_fnc_clientMessage,CLIENT)
+        F(life_util_fnc_playerQuery,CLIENT)
 
         /* Server only functions */
         F(DB_fnc_insertRequest,SERVER)

Altis_Life.Altis/Functions.hpp

@@ -21,6 +21,18 @@ class SpyGlass {
     };
 };
 
+class Life_Client_Utilities {
+    tag = "life_util";
+
+    class Main {
+        file = "core\utils";
+        class isNumber {};
+        class index {};
+        class playerQuery {};
+        class terrainSort {};
+    };
+};
+
 class Life_Client_Core {
     tag = "life";
 
@@ -222,6 +234,9 @@ class Life_Client_Core {
 
     class Gangs {
         file = "core\gangs";
+        class clientGangKick {};
+        class clientGangLeader {};
+        class clientGangLeft {};
         class createGang {};
         class gangCreated {};
         class gangDisband {};
@@ -301,6 +316,7 @@ class Life_Client_Core {
     class Player_Menu {
         file = "core\pmenu";
         class cellphone {};
+        class clientMessage {};
         class giveItem {};
         class giveMoney {};
         class keyDrop {};
@@ -310,6 +326,7 @@ class Life_Client_Core {
         class p_updateMenu {};
         class pardon {};
         class removeItem {};
+        class sendMessage {};
         class s_onChar {};
         class s_onCheckedChange {};
         class s_onSliderChange {};
@@ -357,6 +374,7 @@ class Life_Client_Core {
     class Vehicle {
         file = "core\vehicle";
         class addVehicle2Chain {};
+        class clientGetKey {};
         class colorVehicle {};
         class deviceMine {};
         class FuelRefuelcar {};

Altis_Life.Altis/SpyGlass/fn_initSpy.sqf

@@ -98,11 +98,11 @@ for "_i" from 0 to 1 step 0 do {
     objNull call _checkFunction;
     uiSleep 10;
     objNull call _uiCheckFunction;
-    
+
     if !((count allVariables profileNameSpace) isEqualTo _profileCount) then {
         failMission "SpyGlass";
     };
-    
+
     if !((count allVariables parsingNamespace) isEqualTo 0) then {
         //We should check whether both these variables are present in parsingNS on init, and whether the order is consistent, so to remove the loop
         {

Altis_Life.Altis/SpyGlass/fn_variableCheck.sqf

@@ -49,6 +49,9 @@ class Life_Settings {
     noatm_timer = 10; //Time in minutes that players cannot deposit money after selling stolen gold.
     minimum_cops = 5; //Minimum cops required online to rob the Federal Reserve
 
+    /* Messaging Settings */
+    message_maxlength = 400; //maximum character count allowed in text messages. Used to prevent improper message displaying. -1 to disable the limit
+
     /*Death settings*/
     drop_weapons_onDeath = false; //Set true to enable weapon dropping on death. False (default) will delete player weapons on death, allowing them to be revived with them instead
 

Altis_Life.Altis/config/Config_Master.hpp

@@ -244,7 +244,7 @@ class SpyGlass {
         "life_fnc_adminspectate_meta","life_fnc_adminteleport","life_fnc_adminteleport_meta","life_fnc_admintphere","life_fnc_admintphere_meta","life_fnc_animsync","life_fnc_animsync_meta","life_fnc_arrestaction","life_fnc_arrestaction_meta","life_fnc_atmmenu","life_fnc_atmmenu_meta","life_fnc_bankdeposit","life_fnc_bankdeposit_meta","life_fnc_banktransfer",
         "life_fnc_banktransfer_meta","life_fnc_bankwithdraw","life_fnc_bankwithdraw_meta","life_fnc_blastingcharge","life_fnc_blastingcharge_meta","life_fnc_boltcutter","life_fnc_boltcutter_meta","life_fnc_bountyreceive","life_fnc_bountyreceive_meta","life_fnc_broadcast","life_fnc_broadcast_meta","life_fnc_buyclothes","life_fnc_buyclothes_meta","life_fnc_buyhouse",
         "life_fnc_buyhouse_meta","life_fnc_buyhousegarage","life_fnc_buyhousegarage_meta","life_fnc_buylicense","life_fnc_buylicense_meta","life_fnc_calweightdiff","life_fnc_calweightdiff_meta","life_fnc_capturehideout","life_fnc_capturehideout_meta","life_fnc_catchfish","life_fnc_catchfish_meta","life_fnc_catchturtle","life_fnc_catchturtle_meta","life_fnc_cellphone",
-        "life_fnc_cellphone_meta","life_fnc_checkmap","life_fnc_checkmap_meta","life_fnc_changeclothes","life_fnc_changeclothes_meta","life_fnc_chopshopmenu","life_fnc_chopshopmenu_meta","life_fnc_chopshopselection","life_fnc_chopshopselection_meta","life_fnc_chopshopsell","life_fnc_chopshopsell_meta","life_fnc_chopShopSold","life_fnc_chopShopSold_meta","life_fnc_civmarkers","life_fnc_civmarkers_meta",
+        "life_fnc_cellphone_meta","life_fnc_checkmap","life_fnc_checkmap_meta","life_fnc_changeclothes","life_fnc_changeclothes_meta","life_fnc_chopshopmenu","life_fnc_chopshopmenu_meta","life_fnc_chopshopselection","life_fnc_chopshopselection_meta","life_fnc_chopshopsell","life_fnc_chopshopsell_meta","life_fnc_chopshopsold","life_fnc_chopshopsold_meta","life_fnc_civmarkers","life_fnc_civmarkers_meta",
         "life_fnc_clearvehicleammo","life_fnc_clearvehicleammo_meta","life_fnc_clothingfilter","life_fnc_clothingfilter_meta","life_fnc_clothingmenu","life_fnc_clothingmenu_meta","life_fnc_colorvehicle","life_fnc_colorvehicle_meta","life_fnc_containerinvsearch","life_fnc_containerinvsearch_meta","life_fnc_containermenu","life_fnc_containermenu_meta","life_fnc_copbreakdoor",
         "life_fnc_copbreakdoor_meta","life_fnc_cophouseowner","life_fnc_cophouseowner_meta","life_fnc_copinteractionmenu","life_fnc_copinteractionmenu_meta","life_fnc_coplights","life_fnc_coplights_meta","life_fnc_copmarkers","life_fnc_copmarkers_meta","life_fnc_copsearch","life_fnc_copsearch_meta","life_fnc_copsiren",
         "life_fnc_copsiren_meta","life_fnc_copsplit","life_fnc_copsplit_meta","life_fnc_corpse","life_fnc_corpse_meta","life_fnc_creategang","life_fnc_creategang_meta","life_fnc_deathscreen","life_fnc_deathscreen_meta","life_fnc_defusekit","life_fnc_defusekit_meta","life_fnc_demochargetimer","life_fnc_demochargetimer_meta","life_fnc_devicemine","life_fnc_devicemine_meta",
@@ -273,7 +273,7 @@ class SpyGlass {
         "life_fnc_seizeplayeraction_meta","life_fnc_sellgarage","life_fnc_sellgarage_meta","life_fnc_sellhouse","life_fnc_sellhouse_meta","life_fnc_sellhousegarage","life_fnc_sellhousegarage_meta","life_fnc_servicechopper","life_fnc_servicechopper_meta","life_fnc_setfuel","life_fnc_setfuel_meta","life_fnc_setmapposition","life_fnc_setmapposition_meta","life_fnc_settexture_meta","life_fnc_settingsmenu",
         "life_fnc_settingsmenu_meta","life_fnc_setupactions","life_fnc_setupactions_meta","life_fnc_setupevh","life_fnc_setupevh_meta","life_fnc_simdisable","life_fnc_simdisable_meta","life_fnc_sirenlights","life_fnc_sirenlights_meta","life_fnc_sounddevice","life_fnc_sounddevice_meta","life_fnc_spawnconfirm","life_fnc_spawnconfirm_meta","life_fnc_spawnmenu","life_fnc_spawnmenu_meta","life_fnc_spawnpointcfg",
         "life_fnc_spawnpointcfg_meta","life_fnc_spawnpointselected","life_fnc_spawnpointselected_meta","life_fnc_spikestrip","life_fnc_spikestrip_meta","life_fnc_spikestripeffect","life_fnc_spikestripeffect_meta","life_fnc_stopescorting","life_fnc_stopescorting_meta","life_fnc_storagebox","life_fnc_storagebox_meta","life_fnc_storevehicle","life_fnc_storevehicle_meta","life_fnc_storevehicleaction",
-        "life_fnc_storevehicleaction_meta","life_fnc_startLoadout","life_fnc_startLoadout_meta","life_fnc_stripdownplayer","life_fnc_stripdownplayer_meta","life_fnc_surrender","life_fnc_surrender_meta","life_fnc_survival","life_fnc_survival_meta","life_fnc_tazed","life_fnc_tazed_meta","life_fnc_teleport","life_fnc_teleport_meta","life_fnc_ticketaction","life_fnc_ticketaction_meta","life_fnc_ticketgive",
+        "life_fnc_storevehicleaction_meta","life_fnc_startloadout","life_fnc_startloadout_meta","life_fnc_stripdownplayer","life_fnc_stripdownplayer_meta","life_fnc_surrender","life_fnc_surrender_meta","life_fnc_survival","life_fnc_survival_meta","life_fnc_tazed","life_fnc_tazed_meta","life_fnc_teleport","life_fnc_teleport_meta","life_fnc_ticketaction","life_fnc_ticketaction_meta","life_fnc_ticketgive",
         "life_fnc_ticketgive_meta","life_fnc_ticketpaid","life_fnc_ticketpaid_meta","life_fnc_ticketpay","life_fnc_ticketpay_meta","life_fnc_ticketprompt","life_fnc_ticketprompt_meta","life_fnc_unimpound","life_fnc_unimpound_meta","life_fnc_unrestrain","life_fnc_unrestrain_meta","life_fnc_updateviewdistance","life_fnc_updateviewdistance_meta","life_fnc_useitem","life_fnc_useitem_meta",
         "life_fnc_vehicleanimate","life_fnc_vehicleanimate_meta","life_fnc_vehiclecolor3drefresh","life_fnc_vehiclecolor3drefresh_meta","life_fnc_vehiclecolorcfg","life_fnc_vehiclecolorcfg_meta","life_fnc_vehiclecolorstr","life_fnc_vehiclecolorstr_meta","life_fnc_vehiclegarage","life_fnc_vehiclegarage_meta","life_fnc_vehiclelistcfg","life_fnc_vehiclelistcfg_meta","life_fnc_vehicleowners",
         "life_fnc_vehicleowners_meta","life_fnc_3dpreviewdisplay","life_fnc_3dpreviewdisplay_meta","life_fnc_vehicleshopbuy","life_fnc_vehicleshopbuy_meta","life_fnc_3dpreviewexit","life_fnc_3dpreviewexit_meta","life_fnc_3dpreviewinit","life_fnc_3dpreviewinit_meta","life_fnc_vehicleshoplbchange","life_fnc_vehicleshoplbchange_meta",
@@ -285,12 +285,12 @@ class SpyGlass {
     };
 
     SERVER_Functions[] = {
-        "db_fnc_asynccall","db_fnc_bool","db_fnc_insertrequest","db_fnc_insertvehicle","db_fnc_mresarray","db_fnc_mresstring","db_fnc_mrestoarray","db_fnc_numbersafe","db_fnc_queryrequest","db_fnc_updatepartial","db_fnc_updaterequest","ton_fnc_addhouse","ton_fnc_addhouse_meta","ton_fnc_cell_adminmsg","ton_fnc_cell_adminmsgall","ton_fnc_cell_emsrequest","ton_fnc_cell_textadmin","ton_fnc_cell_textcop",
-        "ton_fnc_cell_textmsg","ton_fnc_chopshopsell","ton_fnc_chopshopsell_meta","ton_fnc_cleanup","ton_fnc_cleanup_meta","ton_fnc_cleanuprequest","ton_fnc_cleanuprequest_meta","ton_fnc_clientdisconnect","ton_fnc_clientdisconnect_meta","ton_fnc_clientgangkick","ton_fnc_clientgangleader","ton_fnc_clientgangleft","TON_fnc_clientGangLeft","ton_fnc_clientgetkey","ton_fnc_clientmessage","ton_fnc_federalupdate",
-        "ton_fnc_federalupdate_meta","ton_fnc_fetchplayerhouses","ton_fnc_fetchplayerhouses_meta","ton_fnc_getid","ton_fnc_getid_meta","ton_fnc_getvehicles","ton_fnc_getvehicles_meta","ton_fnc_housecleanup","ton_fnc_housecleanup_meta","ton_fnc_huntingzone","ton_fnc_huntingzone_meta","ton_fnc_index","ton_fnc_inithouses","ton_fnc_inithouses_meta","ton_fnc_insertgang","ton_fnc_insertgang_meta","ton_fnc_isnumber",
-        "ton_fnc_keymanagement","ton_fnc_keymanagement_meta","ton_fnc_managesc","ton_fnc_managesc_meta","ton_fnc_pickupaction","ton_fnc_pickupaction_meta","ton_fnc_player_query","ton_fnc_queryplayergang","ton_fnc_queryplayergang_meta","ton_fnc_removegang","ton_fnc_removegang_meta","ton_fnc_sellhouse","ton_fnc_sellhouse_meta","ton_fnc_spawnvehicle",
-        "ton_fnc_spawnvehicle_meta","ton_fnc_spikestrip","ton_fnc_spikestrip_meta","ton_fnc_terrainsort","ton_fnc_terrainsort_meta","ton_fnc_updategang","ton_fnc_updategang_meta","ton_fnc_updatehousecontainers","ton_fnc_updatehousecontainers_meta","ton_fnc_updatehousetrunk","ton_fnc_updatehousetrunk_meta","ton_fnc_vehiclecreate","ton_fnc_vehiclecreate_meta","ton_fnc_vehicledead","ton_fnc_vehicledead_meta",
-        "ton_fnc_vehicledelete","ton_fnc_vehicledelete_meta","ton_fnc_vehiclestore","ton_fnc_vehiclestore_meta","ton_fnc_entityRespawned","ton_fnc_entityRespawned_meta"
+        "db_fnc_asynccall","db_fnc_bool","db_fnc_insertrequest","db_fnc_insertvehicle","db_fnc_mresarray","db_fnc_mresstring","db_fnc_mrestoarray","db_fnc_numbersafe","db_fnc_queryrequest","db_fnc_updatepartial","db_fnc_updaterequest","ton_fnc_addhouse","ton_fnc_addhouse_meta","life_fnc_sendmessage","life_fnc_sendmessage_meta",
+        "ton_fnc_chopshopsell","ton_fnc_chopshopsell_meta","ton_fnc_cleanup","ton_fnc_cleanup_meta","ton_fnc_cleanuprequest","ton_fnc_cleanuprequest_meta","ton_fnc_clientdisconnect","ton_fnc_clientdisconnect_meta","life_fnc_clientGangKick","life_fnc_clientGangLeader","life_fnc_clientGangLeft","life_fnc_clientGangLeft","ton_fnc_clientgetkey","life_fnc_clientmessage",
+        "ton_fnc_fetchplayerhouses","ton_fnc_fetchplayerhouses_meta","ton_fnc_getid","ton_fnc_getid_meta","ton_fnc_getvehicles","ton_fnc_getvehicles_meta","ton_fnc_housecleanup","ton_fnc_housecleanup_meta","ton_fnc_huntingzone","ton_fnc_huntingzone_meta","life_util_fnc_index","ton_fnc_inithouses","ton_fnc_inithouses_meta","ton_fnc_insertgang","ton_fnc_insertgang_meta","life_util_fnc_isnumber",
+        "ton_fnc_keymanagement","ton_fnc_keymanagement_meta","ton_fnc_managesc","ton_fnc_managesc_meta","ton_fnc_pickupaction","ton_fnc_pickupaction_meta","life_util_fnc_playerquery","ton_fnc_queryplayergang","ton_fnc_queryplayergang_meta","ton_fnc_removegang","ton_fnc_removegang_meta","ton_fnc_sellhouse","ton_fnc_sellhouse_meta","ton_fnc_spawnvehicle",
+        "ton_fnc_spawnvehicle_meta","ton_fnc_spikestrip","ton_fnc_spikestrip_meta","life_util_fnc_terrainsort","life_util_fnc_terrainsort_meta","ton_fnc_updategang","ton_fnc_updategang_meta","ton_fnc_updatehousecontainers","ton_fnc_updatehousecontainers_meta","ton_fnc_updatehousetrunk","ton_fnc_updatehousetrunk_meta","ton_fnc_vehiclecreate","ton_fnc_vehiclecreate_meta","ton_fnc_vehicledead","ton_fnc_vehicledead_meta",
+        "ton_fnc_vehicledelete","ton_fnc_vehicledelete_meta","ton_fnc_vehiclestore","ton_fnc_vehiclestore_meta","ton_fnc_entityrespawned","ton_fnc_entityrespawned_meta"
     };
 
     SOCK_Functions[] = {

Altis_Life.Altis/config/Config_SpyGlass.hpp

@@ -1,36 +1,34 @@
-#include "..\..\script_macros.hpp"
-/*
-    File: fn_arrestAction.sqf
-    Author:
-
-    Description:
-    Arrests the targeted person.
-*/
-private ["_unit","_id"];
-_unit = param [0,objNull,[objNull]];
-if (isNull _unit) exitWith {}; //Not valid
-if (isNil "_unit") exitWith {}; //Not Valid
-if (!(_unit isKindOf "CAManBase")) exitWith {}; //Not a unit
-if (!isPlayer _unit) exitWith {}; //Not a human
-if (!(_unit getVariable "restrained")) exitWith {}; //He's not restrained.
-if (!((side _unit) in [civilian,independent])) exitWith {}; //Not a civ
-
-if (life_HC_isActive) then {
-    [getPlayerUID _unit,_unit,player,false] remoteExecCall ["HC_fnc_wantedBounty",HC_Life];
-} else {
-    [getPlayerUID _unit,_unit,player,false] remoteExecCall ["life_fnc_wantedBounty",RSERV];
-};
-
-if (isNull _unit) exitWith {}; //Not valid
-detach _unit;
-[_unit,false] remoteExecCall ["life_fnc_jail",_unit];
-[0,"STR_NOTF_Arrested_1",true, [_unit getVariable ["realname",name _unit], profileName]] remoteExecCall ["life_fnc_broadcast",RCLIENT];
-
-if (LIFE_SETTINGS(getNumber,"player_advancedLog") isEqualTo 1) then {
-    if (LIFE_SETTINGS(getNumber,"battlEye_friendlyLogging") isEqualTo 1) then {
-        advanced_log = format [localize "STR_DL_AL_Arrested_BEF",_unit getVariable ["realname",name _unit]];
-    } else {
-        advanced_log = format [localize "STR_DL_AL_Arrested",profileName,(getPlayerUID player),_unit getVariable ["realname",name _unit]];
-    };
-    publicVariableServer "advanced_log";
-};
+#include "..\..\script_macros.hpp"
+/*
+    File: fn_arrestAction.sqf
+    Author:
+
+    Description:
+    Arrests the targeted person.
+*/
+params [
+    ["_unit", objNull, [objNull]]
+];
+
+if (isNull _unit || {!isPlayer _unit}) exitWith {}; //Not valid
+if !(_unit getVariable "restrained") exitWith {}; //He's not restrained.
+if !((side _unit) in [civilian,independent]) exitWith {}; //Not a civ
+
+if (life_HC_isActive) then {
+    [getPlayerUID _unit,_unit,player,false] remoteExecCall ["HC_fnc_wantedBounty",HC_Life];
+} else {
+    [getPlayerUID _unit,_unit,player,false] remoteExecCall ["life_fnc_wantedBounty",RSERV];
+};
+
+detach _unit;
+[_unit,false] remoteExecCall ["life_fnc_jail",_unit];
+[0,"STR_NOTF_Arrested_1",true, [_unit getVariable ["realname",name _unit], profileName]] remoteExecCall ["life_fnc_broadcast",RCLIENT];
+
+if (LIFE_SETTINGS(getNumber,"player_advancedLog") isEqualTo 1) then {
+    if (LIFE_SETTINGS(getNumber,"battlEye_friendlyLogging") isEqualTo 1) then {
+        advanced_log = format [localize "STR_DL_AL_Arrested_BEF",_unit getVariable ["realname",name _unit]];
+    } else {
+        advanced_log = format [localize "STR_DL_AL_Arrested",profileName,(getPlayerUID player),_unit getVariable ["realname",name _unit]];
+    };
+    publicVariableServer "advanced_log";
+};

Altis_Life.Altis/core/actions/fn_arrestAction.sqf

@@ -6,14 +6,13 @@
     Description:
     Called when purchasing a license. May need to be revised.
 */
-private ["_type","_varName","_displayName","_sideFlag","_price"];
-_type = _this select 3;
+params ["", "", "", "_type"];
 
 if (!isClass (missionConfigFile >> "Licenses" >> _type)) exitWith {}; //Bad entry?
-_displayName = M_CONFIG(getText,"Licenses",_type,"displayName");
-_price = M_CONFIG(getNumber,"Licenses",_type,"price");
-_sideFlag = M_CONFIG(getText,"Licenses",_type,"side");
-_varName = LICENSE_VARNAME(_type,_sideFlag);
+private _displayName = M_CONFIG(getText,"Licenses",_type,"displayName");
+private _price = M_CONFIG(getNumber,"Licenses",_type,"price");
+private _sideFlag = M_CONFIG(getText,"Licenses",_type,"side");
+private _varName = LICENSE_VARNAME(_type,_sideFlag);
 
 if (CASH < _price) exitWith {hint format [localize "STR_NOTF_NE_1",[_price] call life_fnc_numberText,localize _displayName];};
 CASH = CASH - _price;

Altis_Life.Altis/core/actions/fn_buyLicense.sqf

@@ -9,13 +9,13 @@
 private _altisArray = ["Land_u_Barracks_V2_F","Land_i_Barracks_V2_F"];
 private _tanoaArray = ["Land_School_01_F","Land_Warehouse_03_F","Land_House_Small_02_F"];
 
-private _hideoutObjs = [[["Altis", _altisArray], ["Tanoa", _tanoaArray]]] call TON_fnc_terrainSort;
+private _hideoutObjs = [[["Altis", _altisArray], ["Tanoa", _tanoaArray]]] call life_util_fnc_terrainSort;
 
 private _hideout = (nearestObjects[getPosATL player,_hideoutObjs,25]) select 0;
 private _group = _hideout getVariable ["gangOwner",grpNull];
 
 if (isNil {group player getVariable "gang_name"}) exitWith {titleText[localize "STR_GNOTF_CreateGang","PLAIN"];};
-if (_group == group player) exitWith {titleText[localize "STR_GNOTF_Controlled","PLAIN"]};
+if (_group isEqualTo group player) exitWith {titleText[localize "STR_GNOTF_Controlled","PLAIN"]};
 if ((_hideout getVariable ["inCapture",false])) exitWith {hint localize "STR_GNOTF_onePersonAtATime";};
 
 private "_action";