Arma3_Exile/ExAd
1
0
Fork 0
mirror of https://github.com/Bjanski/ExAd.git synced 2024-08-30 16:52:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #97 from GamingAtDeathsDoor/master

Browse Source 
Changes to suit Exile & make better gameplay
This commit is contained in:
Jan Babor 2017-09-21 22:15:21 +02:00 committed by GitHub
commit 24be1cfa8d
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
@ExileServer/addons/exad_hacking/Functions/fn_startHack.sqf
View File

@ -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["<t color='%1' size='%2' font='%3'>%4</t><br/><t color='%5' size='%6' font='%7'>%8</t>", 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
true

4
mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf
View File

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

9
mpmissions/Exile.Altis/ExAdClient/VirtualGarage/Functions/fn_allowVGStore.sqf
View File

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

4
mpmissions/Exile.Altis/ExAdClient/VirtualGarage/customize.sqf
View File

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

6
mpmissions/Exile.Altis/stringtable.xml
View File

@ -14,7 +14,7 @@
</Container>
<Container name="Info">
<Key ID="STR_ExAd_HALOPARACHUTE_INFO_DETACH">
<Original>You can eject from parachute with: Alt Shift x</Original>
<Original>Alt+Shift+V to Eject from Parachute!</Original>
</Key>
</Container>
</Package>
@ -110,7 +110,7 @@
<Original>Hack Activity</Original>
</Key>
<Key ID="STR_ExAd_HACKING_HINT_HACK_START">
<Original>A brute force hack is detected on the grid!</Original>
<Original>Someone is hacking another person's base!</Original>
</Key>
</Container>
</Package>
@ -208,4 +208,4 @@
</Key>
</Container>
</Package>
</Project>
</Project>