From 6e9c5cc1d95c6c472c6fa9d46320ca0555c75b7b Mon Sep 17 00:00:00 2001 From: "[GADD]Monkeynutz" Date: Tue, 31 Oct 2017 13:49:17 +0000 Subject: [PATCH 1/7] Removed old Hint and Replaced with Baguette. Did not update this on the last pull request. Apologies :P --- .../ExAdClient/HaloParachute/Functions/fn_pullParachute.sqf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/Functions/fn_pullParachute.sqf b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/Functions/fn_pullParachute.sqf index dc1f85e..7fc8b48 100644 --- a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/Functions/fn_pullParachute.sqf +++ b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/Functions/fn_pullParachute.sqf @@ -40,7 +40,8 @@ if(ExAd_HALOPARACHUTE_SAFE_MODE)then{ }; if(ExAd_HALOPARACHUTE_USE_KEY_ACTIONS)then{ - hint localize "STR_ExAd_HALOPARACHUTE_INFO_DETACH" + //hint localize "STR_ExAd_HALOPARACHUTE_INFO_DETACH" + [localize "STR_ExAd_HALOPARACHUTE_INFO_DETACH"] spawn ExileClient_gui_baguette_show; }; -true \ No newline at end of file +true From 44506c626518c65b9bb4ca07cd37bc983344d353 Mon Sep 17 00:00:00 2001 From: "[GADD]Monkeynutz" Date: Wed, 1 Nov 2017 11:46:57 +0000 Subject: [PATCH 2/7] Added 64-bit version --- .../extDB/sql_custom_v2 (64-bit)/exile.ini | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 @ExileServer/extDB/sql_custom_v2 (64-bit)/exile.ini diff --git a/@ExileServer/extDB/sql_custom_v2 (64-bit)/exile.ini b/@ExileServer/extDB/sql_custom_v2 (64-bit)/exile.ini new file mode 100644 index 0000000..c4d9968 --- /dev/null +++ b/@ExileServer/extDB/sql_custom_v2 (64-bit)/exile.ini @@ -0,0 +1,44 @@ +;1. Find following sections and replace the commented lines; +;This is the 64-Bit version of the exile.ini addons for ExAd just to make it easier for those who use 64-Bit servers. + +[loadVehicleIdPage] +;SQL1_1 = SELECT id FROM vehicle LIMIT ?,? +SQL1_1 = SELECT id FROM vehicle WHERE deleted_at IS NULL AND territory_id IS NULL LIMIT ?,? +Number Of Inputs = 2 +SQL1_INPUTS = 1,2 +OUTPUT = 1 + +; Removes vehicles that were not used within ? days +[deleteOldVehicles] +;SQL1_1 = DELETE FROM vehicle WHERE deleted_at < DATE_SUB(NOW(), INTERVAL ? DAY) +SQL1_1 = DELETE FROM vehicle WHERE territory_id IS NULL AND deleted_at < DATE_SUB(NOW(), INTERVAL ? DAY) +Number Of Inputs = 1 +SQL1_INPUTS = 1 + +; Marks for deletion vehicles that were not used within ? days +[markDeleteOldVehicles] +; SQL1_1 = UPDATE vehicle SET deleted_at = NOW() WHERE last_updated_at < DATE_SUB(NOW(), INTERVAL ? DAY) +SQL1_1 = UPDATE vehicle SET deleted_at = NOW() WHERE last_updated_at < DATE_SUB(NOW(), INTERVAL ? DAY) AND territory_id IS NULL +Number Of Inputs = 1 +SQL1_INPUTS = 1 + +;2. Add all below in the end of the file. +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Virtual Garage related queries | ADDED BY [ExAd]Jan +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +[loadTerritoryVehicles] +SQL1_1 = SELECT id, class FROM vehicle WHERE territory_id = ? +Number Of Inputs = 1 +SQL1_INPUTS = 1 +OUTPUT = 1,2-STRING + +[loadVehFromVG] +SQL1_1 = UPDATE vehicle SET territory_id = NULL WHERE id = ? +Number Of Inputs = 1 +SQL1_INPUTS = 1 + +[loadVehToVG] +SQL1_1 = UPDATE vehicle SET territory_id = ? WHERE id = ? +Number Of Inputs = 2 +SQL1_INPUTS = 1,2 \ No newline at end of file From 7c3efafb953889ac0d4f6e0aa4b0b04d36d9dfc3 Mon Sep 17 00:00:00 2001 From: "[GADD]Monkeynutz" Date: Wed, 1 Nov 2017 11:49:46 +0000 Subject: [PATCH 3/7] Delete exile.ini --- .../extDB/sql_custom_v2 (64-bit)/exile.ini | 44 ------------------- 1 file changed, 44 deletions(-) delete mode 100644 @ExileServer/extDB/sql_custom_v2 (64-bit)/exile.ini diff --git a/@ExileServer/extDB/sql_custom_v2 (64-bit)/exile.ini b/@ExileServer/extDB/sql_custom_v2 (64-bit)/exile.ini deleted file mode 100644 index c4d9968..0000000 --- a/@ExileServer/extDB/sql_custom_v2 (64-bit)/exile.ini +++ /dev/null @@ -1,44 +0,0 @@ -;1. Find following sections and replace the commented lines; -;This is the 64-Bit version of the exile.ini addons for ExAd just to make it easier for those who use 64-Bit servers. - -[loadVehicleIdPage] -;SQL1_1 = SELECT id FROM vehicle LIMIT ?,? -SQL1_1 = SELECT id FROM vehicle WHERE deleted_at IS NULL AND territory_id IS NULL LIMIT ?,? -Number Of Inputs = 2 -SQL1_INPUTS = 1,2 -OUTPUT = 1 - -; Removes vehicles that were not used within ? days -[deleteOldVehicles] -;SQL1_1 = DELETE FROM vehicle WHERE deleted_at < DATE_SUB(NOW(), INTERVAL ? DAY) -SQL1_1 = DELETE FROM vehicle WHERE territory_id IS NULL AND deleted_at < DATE_SUB(NOW(), INTERVAL ? DAY) -Number Of Inputs = 1 -SQL1_INPUTS = 1 - -; Marks for deletion vehicles that were not used within ? days -[markDeleteOldVehicles] -; SQL1_1 = UPDATE vehicle SET deleted_at = NOW() WHERE last_updated_at < DATE_SUB(NOW(), INTERVAL ? DAY) -SQL1_1 = UPDATE vehicle SET deleted_at = NOW() WHERE last_updated_at < DATE_SUB(NOW(), INTERVAL ? DAY) AND territory_id IS NULL -Number Of Inputs = 1 -SQL1_INPUTS = 1 - -;2. Add all below in the end of the file. -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Virtual Garage related queries | ADDED BY [ExAd]Jan -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -[loadTerritoryVehicles] -SQL1_1 = SELECT id, class FROM vehicle WHERE territory_id = ? -Number Of Inputs = 1 -SQL1_INPUTS = 1 -OUTPUT = 1,2-STRING - -[loadVehFromVG] -SQL1_1 = UPDATE vehicle SET territory_id = NULL WHERE id = ? -Number Of Inputs = 1 -SQL1_INPUTS = 1 - -[loadVehToVG] -SQL1_1 = UPDATE vehicle SET territory_id = ? WHERE id = ? -Number Of Inputs = 2 -SQL1_INPUTS = 1,2 \ No newline at end of file From 0df23647ef8ef06900232092b8709b0d0ac0c5c4 Mon Sep 17 00:00:00 2001 From: "[GADD]Monkeynutz" Date: Wed, 1 Nov 2017 11:50:53 +0000 Subject: [PATCH 4/7] 64-bit exile.ini uploaded --- .../extDB/sql_custom (64-bit)/exile.ini | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 @ExileServer/extDB/sql_custom (64-bit)/exile.ini diff --git a/@ExileServer/extDB/sql_custom (64-bit)/exile.ini b/@ExileServer/extDB/sql_custom (64-bit)/exile.ini new file mode 100644 index 0000000..fc17f6b --- /dev/null +++ b/@ExileServer/extDB/sql_custom (64-bit)/exile.ini @@ -0,0 +1,38 @@ +;1. Find following sections and replace the commented lines; +;This is the 64-Bit version of the exile.ini addons for ExAd just to make it easier for those who use 64-Bit servers. + +[loadVehicleIdPage] +;SQL1_1 = SELECT id FROM vehicle LIMIT ?,? +SQL1_1 = SELECT id FROM vehicle WHERE deleted_at IS NULL AND territory_id IS NULL LIMIT ?,? +SQL1_INPUTS = 1,2 +OUTPUT = 1 + +; Removes vehicles that were not used within ? days +[deleteOldVehicles] +;SQL1_1 = DELETE FROM vehicle WHERE deleted_at < DATE_SUB(NOW(), INTERVAL ? DAY) +SQL1_1 = DELETE FROM vehicle WHERE territory_id IS NULL AND deleted_at < DATE_SUB(NOW(), INTERVAL ? DAY) +SQL1_INPUTS = 1 + +; Marks for deletion vehicles that were not used within ? days +[markDeleteOldVehicles] +; SQL1_1 = UPDATE vehicle SET deleted_at = NOW() WHERE last_updated_at < DATE_SUB(NOW(), INTERVAL ? DAY) +SQL1_1 = UPDATE vehicle SET deleted_at = NOW() WHERE last_updated_at < DATE_SUB(NOW(), INTERVAL ? DAY) AND territory_id IS NULL +SQL1_INPUTS = 1 + +;2. Add all below in the end of the file. +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; Virtual Garage related queries | ADDED BY [ExAd]Jan +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +[loadTerritoryVehicles] +SQL1_1 = SELECT id, class FROM vehicle WHERE territory_id = ? +SQL1_INPUTS = 1 +OUTPUT = 1,2-STRING + +[loadVehFromVG] +SQL1_1 = UPDATE vehicle SET territory_id = NULL WHERE id = ? +SQL1_INPUTS = 1 + +[loadVehToVG] +SQL1_1 = UPDATE vehicle SET territory_id = ? WHERE id = ? +SQL1_INPUTS = 1,2 \ No newline at end of file From 978dc1b3332e4e4bbebae844c9caa9db5e4f65d5 Mon Sep 17 00:00:00 2001 From: "[GADD]Monkeynutz" Date: Fri, 10 Nov 2017 19:21:13 +0000 Subject: [PATCH 5/7] Added Link + href example. I have added a link to the ArmA 3 wiki that takes people to the Structured Text page. This will help them be able to use this script better and have no problems creating links etc. In the app to rules pages and such. I have also included a href example at the bottom of the script so it adds a link example at the same time as crediting the Add-on. ;) --- .../Exile.Altis/ExAdClient/XM8/Apps/Info/message.sqf | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mpmissions/Exile.Altis/ExAdClient/XM8/Apps/Info/message.sqf b/mpmissions/Exile.Altis/ExAdClient/XM8/Apps/Info/message.sqf index ce7a0a3..0a87374 100644 --- a/mpmissions/Exile.Altis/ExAdClient/XM8/Apps/Info/message.sqf +++ b/mpmissions/Exile.Altis/ExAdClient/XM8/Apps/Info/message.sqf @@ -1,3 +1,12 @@ +/** + + Edit this file and what is on it will be formatted as structured text in game + on the Server Info App. + For information on Structured text in ArmA 3, go here: + https://community.bistudio.com/wiki/Structured_Text + + **/ + GENERAL RULES
______________________________________________________________________________
@@ -9,3 +18,5 @@ ______________________________________________________________________________BUILDING RULES
______________________________________________________________________________
+ +ExAd by Janski
From 09e435e85ee927010dd85d5b1e64b12df9e386be Mon Sep 17 00:00:00 2001 From: "[GADD]Monkeynutz" Date: Tue, 28 Nov 2017 11:02:55 +0000 Subject: [PATCH 6/7] Added fix for deploying while in a vehicle. @Pattoh on the Exile Forums provided this fix. Thanks Pattoh! Quick and easy! --- .../XM8/Apps/DeployVehicle/config.sqf | 117 +++++++++--------- 1 file changed, 60 insertions(+), 57 deletions(-) diff --git a/mpmissions/Exile.Altis/ExAdClient/XM8/Apps/DeployVehicle/config.sqf b/mpmissions/Exile.Altis/ExAdClient/XM8/Apps/DeployVehicle/config.sqf index d7a1f5a..76471c2 100644 --- a/mpmissions/Exile.Altis/ExAdClient/XM8/Apps/DeployVehicle/config.sqf +++ b/mpmissions/Exile.Altis/ExAdClient/XM8/Apps/DeployVehicle/config.sqf @@ -63,70 +63,73 @@ ExAd_XM8_DV_fnc_pack = { }; ExAd_XM8_DV_fnc_spawnVehicle = { - params["_slideClass","_bambiState","_delopyRecipe","_vehicleClass"]; + params["_slideClass","_bambiState","_delopyRecipe","_vehicleClass"]; - try - { - _bambiState = if(isNumber(missionConfigFile >> "CfgXM8" >> _slideClass >> "bambiState")) then - { - if(getNumber(missionConfigFile >> "CfgXM8" >> _slideClass >> "bambiState") > 0)then{true}else{false} - } else {true}; + if !(vehicle player == player) exitwith { + ["ErrorTitleAndText", ["Come on Bruh!", "You can't deploy from inside a vehicle!"]] call ExileClient_gui_toaster_addTemplateToast; + }; + try + { + _bambiState = if(isNumber(missionConfigFile >> "CfgXM8" >> _slideClass >> "bambiState")) then + { + if(getNumber(missionConfigFile >> "CfgXM8" >> _slideClass >> "bambiState") > 0)then{true}else{false} + } else {true}; - if(_bambiState && !ExileClientPlayerIsBambi) then { throw "You can only spawn vehicles as a bambi!"}; + if(_bambiState && !ExileClientPlayerIsBambi) then { throw "You can only spawn vehicles as a bambi!"}; - _delopyRecipe = getArray(missionConfigFile >> "CfgXM8" >> _slideClass >> "recipe"); - if(count _delopyRecipe > 0) then - { - { - if(count _x > 1) then - { - _amount = if(_x select 1 == -1)then{1}else{_x select 1}; - if!([player, [_x select 0, _amount]] call ExAd_XM8_DV_fnc_itemsInCargo) then - { - throw ([_delopyRecipe] call ExAd_XM8_DV_fnc_itemsMissing); - }; - } else { - if!([player, _x select 0] call ExileClient_util_playerEquipment_contains) then - { - throw ([_delopyRecipe] call ExAd_XM8_DV_fnc_itemsMissing); - } - } - }forEach _delopyRecipe; + _delopyRecipe = getArray(missionConfigFile >> "CfgXM8" >> _slideClass >> "recipe"); + if(count _delopyRecipe > 0) then + { + { + if(count _x > 1) then + { + _amount = if(_x select 1 == -1)then{1}else{_x select 1}; + if!([player, [_x select 0, _amount]] call ExAd_XM8_DV_fnc_itemsInCargo) then + { + throw ([_delopyRecipe] call ExAd_XM8_DV_fnc_itemsMissing); + }; + } else { + if!([player, _x select 0] call ExileClient_util_playerEquipment_contains) then + { + throw ([_delopyRecipe] call ExAd_XM8_DV_fnc_itemsMissing); + } + } + }forEach _delopyRecipe; - { - _count = if(count _x > 1)then{(_x select 1)}else{1}; - for "_i" from 1 to _count do { - [player, _x select 0] call ExileClient_util_playerCargo_remove - } - }forEach _delopyRecipe; - }; + { + _count = if(count _x > 1)then{(_x select 1)}else{1}; + for "_i" from 1 to _count do { + [player, _x select 0] call ExileClient_util_playerCargo_remove + } + }forEach _delopyRecipe; + }; - _vehicleClass = getText(missionConfigFile >> "CfgXM8" >> _slideClass >> "vehicleClass"); - if!(isClass(configFile >> "CfgVehicles" >> _vehicleClass ))then { throw "The vehicle class doesn't exist"}; + _vehicleClass = getText(missionConfigFile >> "CfgXM8" >> _slideClass >> "vehicleClass"); + if!(isClass(configFile >> "CfgVehicles" >> _vehicleClass ))then { throw "The vehicle class doesn't exist"}; - [_slideClass] spawn { - params["_slideClass"]; - disableUserInput true; - player playActionNow "Medic"; + [_slideClass] spawn { + params["_slideClass"]; + disableUserInput true; + player playActionNow "Medic"; - uiSleep 3; - ["spawnDeployableVehicle", [netId player, _slideClass]] call ExAd_fnc_serverDispatch; - uiSleep 1; - ["SuccessTitleAndText", ["Vehicle deployed"]] call ExileClient_gui_toaster_addTemplateToast; - ExileClientXM8CurrentSlide = "extraApps"; - disableUserInput false; - }; + uiSleep 3; + ["spawnDeployableVehicle", [netId player, _slideClass]] call ExAd_fnc_serverDispatch; + uiSleep 1; + ["SuccessTitleAndText", ["Vehicle deployed"]] call ExileClient_gui_toaster_addTemplateToast; + ExileClientXM8CurrentSlide = "extraApps"; + disableUserInput false; + }; - ["extraApps", 1] call ExileClient_gui_xm8_slide; - closeDialog 0; + ["extraApps", 1] call ExileClient_gui_xm8_slide; + closeDialog 0; - } - catch{ - [_exception] spawn { - UISleep 0.5; - ["ErrorTitleAndText", ["ExAd - Deploy Vehicle", _this select 0]] call ExileClient_gui_toaster_addTemplateToast; - ["extraApps", 1] call ExileClient_gui_xm8_slide; - }; - }; -}; \ No newline at end of file + } + catch{ + [_exception] spawn { + UISleep 0.5; + ["ErrorTitleAndText", ["ExAd - Deploy Vehicle", _this select 0]] call ExileClient_gui_toaster_addTemplateToast; + ["extraApps", 1] call ExileClient_gui_xm8_slide; + }; + }; +}; From fb7c47242e88ca16712f50f1b1735334d18e0f78 Mon Sep 17 00:00:00 2001 From: "[GADD]Monkeynutz" Date: Tue, 28 Nov 2017 18:10:38 +0000 Subject: [PATCH 7/7] Updated to match configs and fix timer. --- .../ExAdClient/XM8/Apps/DeployVehicle/config.sqf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mpmissions/Exile.Altis/ExAdClient/XM8/Apps/DeployVehicle/config.sqf b/mpmissions/Exile.Altis/ExAdClient/XM8/Apps/DeployVehicle/config.sqf index 76471c2..b80928e 100644 --- a/mpmissions/Exile.Altis/ExAdClient/XM8/Apps/DeployVehicle/config.sqf +++ b/mpmissions/Exile.Altis/ExAdClient/XM8/Apps/DeployVehicle/config.sqf @@ -65,11 +65,11 @@ ExAd_XM8_DV_fnc_pack = { ExAd_XM8_DV_fnc_spawnVehicle = { params["_slideClass","_bambiState","_delopyRecipe","_vehicleClass"]; - if !(vehicle player == player) exitwith { - ["ErrorTitleAndText", ["Come on Bruh!", "You can't deploy from inside a vehicle!"]] call ExileClient_gui_toaster_addTemplateToast; - }; try { + + if !(vehicle player == player) then { throw "You can't do this in a vehicle!"}; + _bambiState = if(isNumber(missionConfigFile >> "CfgXM8" >> _slideClass >> "bambiState")) then { if(getNumber(missionConfigFile >> "CfgXM8" >> _slideClass >> "bambiState") > 0)then{true}else{false}