Merge pull request #101 from GamingAtDeathsDoor/master

Removed old Hint and Replaced with Baguette.
This commit is contained in:
[GADD]Monkeynutz 2017-11-29 11:14:02 +00:00 committed by GitHub
commit 92c5bf5bf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 112 additions and 59 deletions

View File

@ -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

View File

@ -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
true

View File

@ -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};
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}
} 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;
};
};
};
}
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;
};
};
};

View File

@ -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
**/
<t align='center' color='#E48A36'>GENERAL RULES</t><br />
______________________________________________________________________________<br />
@ -9,3 +18,5 @@ ______________________________________________________________________________<b
<t color='#E48A36'>BUILDING RULES</t><br />
______________________________________________________________________________<br />
<t align='center' color='#FF0000'><a href="http://www.exilemod.com/topic/13865-exad-package-of-virtual-garagexm8statsbarhalo-parachuteadmin-eventshackinggrindingvehicle-upgrade/">ExAd by Janski</a></t><br />