From fe39bc6f76e842727afd6ca478491948b42315eb Mon Sep 17 00:00:00 2001 From: "[GADD]Monkeynutz" Date: Wed, 20 Sep 2017 19:30:09 +0100 Subject: [PATCH 1/5] Combat Storing and Boats & Subs Added a toggle-able option to stop people storing their vehicles while in the middle of combat. Added Boats and Subs to the VG allowed vehicle list. --- mpmissions/Exile.Altis/ExAdClient/VirtualGarage/customize.sqf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/customize.sqf b/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/customize.sqf index bcba508..fc71095 100644 --- a/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/customize.sqf +++ b/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/customize.sqf @@ -26,4 +26,6 @@ ExAd_VG_CLEAN_ON_STORE = true; //BOOLEAN - If vehicle inventory should reset w ExAd_VG_SHOW_ADVHINT = false; //BOOLEAN - If the virtual garage should display an Advanced hint upon store and fetch. -ExAd_VG_ALLOWED_VEH_TYPE = ["Car","Air"];//ARRAY - Array with allowed vehicle types for the virtual garage. | "Car", "Tank", "Helicopter", "Plane" or "Air" for both WARNING DON'T USE "LandVehicle" Can crash the Exile system. \ No newline at end of file +ExAd_STOP_COMBAT_STORING = true; //BOOLEAN - If set to true players cannot store vehicles while they are in combat. Prevents combat storing. + +ExAd_VG_ALLOWED_VEH_TYPE = ["Car","Tank","Plane","Air","Ship","Submarine"];//ARRAY - Array with allowed vehicle types for the virtual garage. | "Car", "Tank", "Helicopter", "Plane" or "Air" for both WARNING DON'T USE "LandVehicle" Can crash the Exile system. From b36d94d9272b0dac68a5d67958427ed676e14505 Mon Sep 17 00:00:00 2001 From: "[GADD]Monkeynutz" Date: Wed, 20 Sep 2017 19:31:25 +0100 Subject: [PATCH 2/5] Added code for Combat Storing This file contains the code for the Combat Storing option. --- .../VirtualGarage/Functions/fn_allowVGStore.sqf | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/Functions/fn_allowVGStore.sqf b/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/Functions/fn_allowVGStore.sqf index bb23263..7e69055 100644 --- a/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/Functions/fn_allowVGStore.sqf +++ b/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/Functions/fn_allowVGStore.sqf @@ -15,9 +15,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -private ["_res","_flag"]; +private ["_res","_flag","_cmon1","_cmon2","ExAd_STOP_COMBAT_STORING"]; + +_cmon1 = if (ExileClientPlayerIsInCombat && ExAd_STOP_COMBAT_STORING)exitWith{["ErrorTitleAndText", ["ExAd - Virtual Garage", "You cannot store Vehicles While in Combat!"]] call ExileClient_gui_toaster_addTemplateToast;}; + +_cmon2 = if (isNil "ExAdCurFlagNetId")exitWith{diag_log "ExAdClient: allowVGStore - ExAdCurFlagNetId is nil";false}; -if(isNil "ExAdCurFlagNetId")exitWith{diag_log "ExAdClient: allowVGStore - ExAdCurFlagNetId is nil";false}; _flag = objectFromNetId ExAdCurFlagNetId; _allowedVeh = _flag call ExAd_fnc_allowedVGVeh; @@ -25,4 +28,4 @@ _storedVeh = count (_flag getVariable ["ExAdVGVeh", []]); _res = if(_allowedVeh > _storedVeh)then{true}else{false}; -_res \ No newline at end of file +_res From 836746d60fc1e27eb272130e1d67e4bde79b0bc5 Mon Sep 17 00:00:00 2001 From: "[GADD]Monkeynutz" Date: Wed, 20 Sep 2017 19:37:53 +0100 Subject: [PATCH 3/5] Changed messages to fit into baguette messages --- mpmissions/Exile.Altis/stringtable.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mpmissions/Exile.Altis/stringtable.xml b/mpmissions/Exile.Altis/stringtable.xml index deccff5..16f63c7 100644 --- a/mpmissions/Exile.Altis/stringtable.xml +++ b/mpmissions/Exile.Altis/stringtable.xml @@ -14,7 +14,7 @@ - You can eject from parachute with: Alt Shift x + Alt+Shift+V to Eject from Parachute! @@ -110,7 +110,7 @@ Hack Activity - A brute force hack is detected on the grid! + Someone is hacking another person's base! @@ -208,4 +208,4 @@ - \ No newline at end of file + From 7ca7a126df1c0a30a64009164d656fde7c10f8fd Mon Sep 17 00:00:00 2001 From: "[GADD]Monkeynutz" Date: Wed, 20 Sep 2017 19:42:11 +0100 Subject: [PATCH 4/5] Baguette request instead of hint --- @ExileServer/addons/exad_hacking/Functions/fn_startHack.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/@ExileServer/addons/exad_hacking/Functions/fn_startHack.sqf b/@ExileServer/addons/exad_hacking/Functions/fn_startHack.sqf index 0f57866..ecec71a 100644 --- a/@ExileServer/addons/exad_hacking/Functions/fn_startHack.sqf +++ b/@ExileServer/addons/exad_hacking/Functions/fn_startHack.sqf @@ -67,7 +67,7 @@ _player removeItem "Exile_Item_Laptop"; params ["_object","_player","_laptop","_flag","_markers","_marker","_success","_ticks","_newSize","_destroy","_msg"]; UISleep 2; - (parseText (format["%4
%8", ExAd_Hint_Title_Color, ExAd_Hint_Title_Size, ExAd_Hint_Title_Font,STR_ExAd_HACKING_HINT_TITLE, ExAd_Hint_Msg_Color, ExAd_Hint_Msg_Size, ExAd_Hint_Msg_Font, STR_ExAd_HACKING_HINT_HACK_START])) remoteExec ["hint", -2]; + ["baguetteRequest", ["Hacktivity Detected on the Grid!"]] call ExileServer_system_network_send_broadcast; if(ExAd_HACKS_IN_PROGRESS >= ExAd_HACKING_ALLOWED_HACKS)exitWith{ _laptop setVariable ["ExAd_HACKING_IN_PROGRESS", false, true]; @@ -174,4 +174,4 @@ _player removeItem "Exile_Item_Laptop"; {deleteMarker _x}forEach _markers; }; -true \ No newline at end of file +true From 48f8ffeafd3a3e79f63cab87be746807e99f7e51 Mon Sep 17 00:00:00 2001 From: "[GADD]Monkeynutz" Date: Wed, 20 Sep 2017 19:48:17 +0100 Subject: [PATCH 5/5] Changed 'X' to 'V' Makes it safer for players not to eject when doing multiple actions e.g. Looking around, thrusting up and autohover/vectoring --- mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf index 358efb2..347f783 100644 --- a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf +++ b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf @@ -42,7 +42,7 @@ if(isNil "ExAd_ACTION_EJECT_HEIGHT")then{ExAd_ACTION_EJECT_HEIGHT = 0;}; if(ExAd_HALOPARACHUTE_USE_KEY_ACTIONS)then{ ExAd_ACTION_HALOPARACHUTE_USE_KEY_ACTIONS = (findDisplay 46) displayAddEventHandler ["KeyDown",{ - if(_this select 1 == 45 && _this select 2 && _this select 4)then{ + if(_this select 1 == 47 && _this select 2 && _this select 4)then{ if((getPos player) select 2 > ExAd_ACTION_EJECT_HEIGHT && vehicle player != player)then{ call ExAd_fnc_ejectPlayer }else{ @@ -64,4 +64,4 @@ if(isNil "ExAd_ACTION_EJECT_HEIGHT")then{ExAd_ACTION_EJECT_HEIGHT = 0;}; (findDisplay 46) displayRemoveEventHandler ["KeyDown", ExAd_ACTION_HALOPARACHUTE_USE_KEY_ACTIONS]; }; }; -}; \ No newline at end of file +};