Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove stupid functions.sqf #612

Merged
merged 46 commits into from
Apr 14, 2020
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
1cc038b
move functions client side
blackfisch Feb 15, 2020
4b64f0a
rework all affected functions
blackfisch Feb 15, 2020
ca6aafa
spyglass to lowercase
blackfisch Mar 9, 2020
0069564
git rm functions.sqf
BoGuu Mar 9, 2020
3639c24
Merge branch 'BlackFisch-remove-stupid-functions.sqf'
BoGuu Mar 9, 2020
c2db35f
Appease the new gods
BoGuu Mar 9, 2020
44baf62
rename player_query -> playerQuery
blackfisch Mar 10, 2020
e5ba4df
Merge branch 'remove-stupid-functions.sqf' of https://github.com/Blac…
blackfisch Mar 10, 2020
63e1ac6
spyglass lowercase
blackfisch Mar 10, 2020
b9a73ee
max message length as config setting
blackfisch Mar 10, 2020
c46f1ae
fancy number checking
blackfisch Mar 10, 2020
5a50d4a
Merge branch 'master' into remove-stupid-functions.sqf
blackfisch Mar 11, 2020
55702f4
tested& fixed (prefix wrong)
blackfisch Mar 19, 2020
c6e81e1
Merge branch 'remove-stupid-functions.sqf' of https://github.com/Blac…
blackfisch Mar 19, 2020
fe13833
centralized sendMEssage file instead of 5 single ones
blackfisch Mar 19, 2020
b4ed6a8
Merge branch 'master' into remove-stupid-functions.sqf
blackfisch Mar 19, 2020
8b1f49e
params fix
blackfisch Mar 19, 2020
7f238bb
Merge branch 'remove-stupid-functions.sqf' of https://github.com/Blac…
blackfisch Mar 19, 2020
22a2d5f
remove check since EVH should be working
blackfisch Mar 19, 2020
22c77f0
me stupid, only select for msg to player
blackfisch Mar 19, 2020
752442a
spyglass for dom
blackfisch Mar 19, 2020
734746e
ton_ to life_
blackfisch Mar 19, 2020
f449f66
spyglass for dom #2
blackfisch Mar 19, 2020
71c7947
move terrainsort
blackfisch Mar 19, 2020
ab630f1
Update Altis_Life.Altis/stringtable.xml
blackfisch Mar 19, 2020
e9110aa
newlines and var renaming
blackfisch Mar 19, 2020
bdd91a2
Update Altis_Life.Altis/stringtable.xml
blackfisch Mar 19, 2020
2dea8a4
Merge branch 'master' into remove-stupid-functions.sqf
DomT602 Mar 19, 2020
c1b20bd
rework clientMessage to use string parameter, warning message if no u…
blackfisch Mar 19, 2020
036611e
Merge branch 'remove-stupid-functions.sqf' of https://github.com/Blac…
blackfisch Mar 19, 2020
0d65d9e
more languages
blackfisch Mar 19, 2020
f5d3e5c
grpnull
blackfisch Mar 19, 2020
029097c
more grpnull
blackfisch Mar 19, 2020
f459897
locality for gang stuff etc
blackfisch Mar 21, 2020
b8206f6
stringtable
blackfisch Mar 21, 2020
7c4c48e
tab stuff or whatever
blackfisch Mar 21, 2020
84bed35
jip
blackfisch Mar 21, 2020
1ebc0d4
remtoeexec -> remoteexeccall
blackfisch Mar 21, 2020
4903f00
local check since groupowner is server only
blackfisch Mar 21, 2020
1db636d
Merge branch 'master' into remove-stupid-functions.sqf
BoGuu Mar 25, 2020
dc5380f
Merge branch 'master' into remove-stupid-functions.sqf
DomT602 Mar 25, 2020
1e2cfa9
BE filters
blackfisch Mar 26, 2020
ec6f28c
Merge branch 'master' into remove-stupid-functions.sqf
blackfisch Mar 26, 2020
592d629
Merge branch 'master' into remove-stupid-functions.sqf
DomT602 Apr 3, 2020
40d86a9
Merge branch 'master' into remove-stupid-functions.sqf
DomT602 Apr 13, 2020
8be3611
Update Altis_Life.Altis/core/gangs/fn_gangKick.sqf
BoGuu Apr 13, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Altis_Life.Altis/CfgRemoteExec.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
F(life_fnc_clientGangLeader,CLIENT)
F(life_fnc_clientGangLeft,CLIENT)
blackfisch marked this conversation as resolved.
Show resolved Hide resolved
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)
Expand Down
18 changes: 18 additions & 0 deletions Altis_Life.Altis/Functions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -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 {};
Expand Down Expand Up @@ -301,6 +316,7 @@ class Life_Client_Core {
class Player_Menu {
file = "core\pmenu";
class cellphone {};
class clientMessage {};
class giveItem {};
class giveMoney {};
class keyDrop {};
Expand All @@ -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 {};
Expand Down Expand Up @@ -357,6 +374,7 @@ class Life_Client_Core {
class Vehicle {
file = "core\vehicle";
class addVehicle2Chain {};
class clientGetKey {};
class colorVehicle {};
class deviceMine {};
class FuelRefuelcar {};
Expand Down
4 changes: 2 additions & 2 deletions Altis_Life.Altis/SpyGlass/fn_variableCheck.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
3 changes: 3 additions & 0 deletions Altis_Life.Altis/config/Config_Master.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 8 additions & 8 deletions Altis_Life.Altis/config/Config_SpyGlass.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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_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","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[] = {
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/actions/fn_captureHideout.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
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];
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/admin/fn_adminQuery.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ _info = call compile format ["%1", _info];

if (isNil "_info") exitWith {_text ctrlSetText localize "STR_ANOTF_QueryFail";};
if (isNull _info) exitWith {_text ctrlSetText localize "STR_ANOTF_QueryFail";};
[player] remoteExec ["TON_fnc_player_query",_info];
remoteExecCall ["life_util_fnc_playerQuery",_info];
_text ctrlSetText localize "STR_ANOTF_Query";
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/civilian/fn_jailMe.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ for "_i" from 0 to 1 step 0 do {
player forceWalk true;
};

private _escDist = [[["Altis", 60], ["Tanoa", 145]]] call TON_fnc_terrainSort;
private _escDist = [[["Altis", 60], ["Tanoa", 145]]] call life_util_fnc_terrainSort;

if (player distance (getMarkerPos "jail_marker") > _escDist) exitWith {
_esc = true;
Expand Down
4 changes: 2 additions & 2 deletions Altis_Life.Altis/core/cop/fn_fedCamDisplay.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ params [
private _altisArray = [16019.5,16952.9,0];
private _tanoaArray = [11074.2,11501.5,0.00137329];

private _pos = [[["Altis", _altisArray], ["Tanoa", _tanoaArray]]] call TON_fnc_terrainSort;
private _pos = [[["Altis", _altisArray], ["Tanoa", _tanoaArray]]] call life_util_fnc_terrainSort;

private _dome = nearestObject [_pos,"Land_Dome_Big_F"];

Expand All @@ -37,7 +37,7 @@ private _mTwPositions = [
["back",[28.9248,-42.0977,-3.8896],[-1.33789,-24.6035,-10.2108]]
];

private _index = [_mode,_mTwPositions] call TON_fnc_index;
private _index = [_mode,_mTwPositions] call life_util_fnc_index;

if (_index isEqualTo -1) then {
//Turn off
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/cop/fn_questionDealer.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ _names = "";
if ((_x select 2) > 150000) then {
_val = round((_x select 2) / 16);
} else {
_val = ["483",_crimes] call TON_fnc_index;
_val = ["483",_crimes] call life_util_fnc_index;
_val = ((_crimes select _val) select 1);
if (_val isEqualType "") then {
_val = parseNumber _val;
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/cop/fn_ticketGive.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if (isNull life_ticket_unit) exitWith {hint localize "STR_Cop_TicketExist"};

private _val = ctrlText 2652;

if (!([_val] call TON_fnc_isnumber)) exitWith {hint localize "STR_Cop_TicketNum"};
if (!([_val] call life_util_fnc_isNumber)) exitWith {hint localize "STR_Cop_TicketNum"};
if ((parseNumber _val) > 200000) exitWith {hint localize "STR_Cop_TicketOver100"};

[0,"STR_Cop_TicketGive",true,[profileName,[(parseNumber _val)] call life_fnc_numberText,life_ticket_unit getVariable ["realname",name life_ticket_unit]]] remoteExecCall ["life_fnc_broadcast",RCLIENT];
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/fn_initCiv.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/
private _altisArray = ["Land_i_Shop_01_V1_F","Land_i_Shop_01_V2_F","Land_i_Shop_01_V3_F","Land_i_Shop_02_V1_F","Land_i_Shop_02_V2_F","Land_i_Shop_02_V3_F"];
private _tanoaArray = ["Land_House_Small_01_F"];
private _spawnBuildings = [[["Altis", _altisArray], ["Tanoa", _tanoaArray]]] call TON_fnc_terrainSort;
private _spawnBuildings = [[["Altis", _altisArray], ["Tanoa", _tanoaArray]]] call life_util_fnc_terrainSort;

civ_spawn_1 = nearestObjects[getMarkerPos "civ_spawn_1", _spawnBuildings,350];
civ_spawn_2 = nearestObjects[getMarkerPos "civ_spawn_2", _spawnBuildings,350];
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/fn_setupStationService.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ private _tanoaPositions = [
[11637.2,13052.8,-0.228891]
];

private _stationPositions = [[["Altis", _altisPositions], ["Tanoa", _tanoaPositions]]] call TON_fnc_terrainSort;
private _stationPositions = [[["Altis", _altisPositions], ["Tanoa", _tanoaPositions]]] call life_util_fnc_terrainSort;

{
private _pump = nearestObjects [_x,["Land_fs_feed_F","Land_FuelStation_01_pump_F","Land_FuelStation_02_pump_F"],5] select 0;
Expand Down
4 changes: 2 additions & 2 deletions Altis_Life.Altis/core/functions/fn_actionKeyHandler.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ if ((_curObject isKindOf "B_supplyCrate_F" || _curObject isKindOf "Box_IND_Grena
};
};

private _vaultHouse = [[["Altis", "Land_Research_house_V1_F"], ["Tanoa", "Land_Medevac_house_V1_F"]]] call TON_fnc_terrainSort;
private _vaultHouse = [[["Altis", "Land_Research_house_V1_F"], ["Tanoa", "Land_Medevac_house_V1_F"]]] call life_util_fnc_terrainSort;
private _altisArray = [16019.5,16952.9,0];
private _tanoaArray = [11074.2,11501.5,0.00137329];
private _pos = [[["Altis", _altisArray], ["Tanoa", _tanoaArray]]] call TON_fnc_terrainSort;
private _pos = [[["Altis", _altisArray], ["Tanoa", _tanoaArray]]] call life_util_fnc_terrainSort;

if (_curObject isKindOf "House_F" && {player distance _curObject < 12} || ((nearestObject [_pos,"Land_Dome_Big_F"]) isEqualTo _curObject || (nearestObject [_pos,_vaultHouse]) isEqualTo _curObject)) exitWith {
[_curObject] call life_fnc_houseMenu;
Expand Down
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/functions/fn_receiveMoney.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ params [

if (isNull _unit || isNull _from || _val isEqualTo "") exitWith {};
if !(player isEqualTo _unit) exitWith {};
if (!([_val] call TON_fnc_isnumber)) exitWith {};
if (!([_val] call life_util_fnc_isNumber)) exitWith {};
if (_unit == _from) exitWith {}; //Bad boy, trying to exploit his way to riches.

hint format [localize "STR_NOTF_GivenMoney",_from getVariable ["realname",name _from],[(parseNumber (_val))] call life_fnc_numberText];
Expand Down
10 changes: 10 additions & 0 deletions Altis_Life.Altis/core/gangs/fn_clientGangKick.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/*
File: fn_clientGangKick.sqf
Author: Bryan "Tonic" Boardwine

Description: handles being kicked out of a gang
*/

life_my_gang = objNull;
[player] joinSilent (createGroup civilian);
hint localize "STR_GNOTF_KickOutGang";
10 changes: 10 additions & 0 deletions Altis_Life.Altis/core/gangs/fn_clientGangLeader.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/*
File: fn_clientGangLeader.sqf
Author: Bryan "Tonic" Boardwine

Description: appoints player as gang leader
*/

player setRank "COLONEL";
(group player) selectLeader player;
hint localize "STR_GNOTF_GaveTransfer";
10 changes: 10 additions & 0 deletions Altis_Life.Altis/core/gangs/fn_clientGangLeft.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/*
File: fn_clientGangLeft.sqf
Author: Bryan "Tonic" Boardwine

Description: leaves the group
*/

life_my_gang = objNull;
blackfisch marked this conversation as resolved.
Show resolved Hide resolved
[player] joinSilent (createGroup civilian);
hint localize "STR_GNOTF_LeaveGang";
2 changes: 1 addition & 1 deletion Altis_Life.Altis/core/gangs/fn_gangKick.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if (!(_members isEqualType [])) exitWith {};
_members = _members - [_unitID];
group player setVariable ["gang_members",_members,true];

[_unit,group player] remoteExec ["TON_fnc_clientGangKick",_unit]; //Boot that bitch!
remoteExecCall ["life_fnc_clientGangKick",_unit]; //Boot that bitch!
BoGuu marked this conversation as resolved.
Show resolved Hide resolved

if (life_HC_isActive) then {
[4,group player] remoteExec ["HC_fnc_updateGang",HC_Life]; //Update the database.
Expand Down
Loading