v0.7.6 build 20

Solved the issue where territoryPlayerPresent used an array instead of a
number for the comparison.
This commit is contained in:
Bjanski 2016-06-10 01:22:31 +02:00
parent 28770808a9
commit f1d8a9fa27
9 changed files with 14 additions and 13 deletions

View File

@ -1 +1 @@
/* fn_territoryPlayerPresent.sqf Copyright 2016 Jan Babor Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ params ["_flag","_res"]; _res = false; { if([ExileClientInteractionObject, getPlayerUID _x] call ExileClient_util_territory_getAccessLevel > 0)exitWith{_res = true}; }forEach playableUnits _res
/* fn_territoryPlayerPresent.sqf Copyright 2016 Jan Babor Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ params ["_flag","_res"]; _res = false; { if( (([_flag, getPlayerUID _x ] call ExileClient_util_territory_getAccessLevel) select 0) > 0 ) exitWith { _res = true } }forEach playableUnits; _res

View File

@ -40,6 +40,7 @@ class CfgFunctions {
class createCrate {};
class createMarker {};
class putInContainer {};
class territoryPlayerPresent {};
};
};
};

View File

@ -23,6 +23,11 @@ _player = objectFromNetId ([_this, 1, "",[""]] call BIS_fnc_param);
if(isNull _object || isNull _player)exitWith{false};
_flag = ((getPos _object) nearObjects ["Exile_Construction_Flag_Static", 150]) select 0;
if(ExAd_HACKING_PLAYER_ONLINE && !([_flag] call ExAdServer_fnc_territoryPlayerPresent))exitWith{
[STR_ExAd_HACKING_NOTI_NO_PLAYER_PRESENT ,0,0.6,2,0] remoteExec ["BIS_fnc_dynamicText",owner _player];
};
if(_flag getVariable ["ExAd_HACKS_SUCCEEDED",0] >= ExAd_HACKING_TERRITORY_MAX)exitWith{
[STR_ExAd_HACKING_NOTI_MAX_TERRITORY_HACKS_REACHED ,0,0.6,2,0] remoteExec ["BIS_fnc_dynamicText",owner _player];
};

View File

@ -1,7 +1,7 @@
#<img src="logo.png" alt="ExAd" width="200" />
# Changelog:
## 160610 . v0.7.6
## 160610 01:20 . v0.7.6
###Fixed
* Quick-fix - VG App scroll for stored list(Virtual Garage)
* The configuration file could be reed after the postInit script (All) - IMPORTANT TO UPDATE ALL PLUGINS.

View File

@ -31,5 +31,4 @@ class Utilities
class call {};
class getNearByLocalVeh {};
class localize {};
class territoryPlayerPresent {};
};

View File

@ -15,8 +15,4 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
private["_res"];
_res = (('Exile_Item_Laptop' in (magazines player)) && ((ExileClientInteractionObject getvariable ['ExileIsLocked',1]) isEqualTo -1) && (({alive _x}count playableUnits) >= ExAd_HACKING_MIN_PLAYERS_ONLINE));
if(_res && ExAd_HACKING_PLAYER_ONLINE)then{ExileClientInteractionObject call ExAd_fnc_territoryPlayerPresent}else{_res}
(('Exile_Item_Laptop' in (magazines player)) && ((ExileClientInteractionObject getvariable ['ExileIsLocked',1]) isEqualTo -1) && (({alive _x}count playableUnits) >= ExAd_HACKING_MIN_PLAYERS_ONLINE))

View File

@ -15,8 +15,4 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
private["_res"];
_res = (('Exile_Item_Laptop' in (magazines player)) && ((([ExileClientInteractionObject, getPlayerUID player] call ExileClient_util_territory_getAccessLevel) select 0) < ExAd_VG_ACCESS_LEVEL) && (({alive _x}count playableUnits) >= ExAd_HACKING_MIN_PLAYERS_ONLINE));
if(_res && ExAd_HACKING_PLAYER_ONLINE)then{ExileClientInteractionObject call ExAd_fnc_territoryPlayerPresent}else{_res}
(('Exile_Item_Laptop' in (magazines player)) && ((([ExileClientInteractionObject, getPlayerUID player] call ExileClient_util_territory_getAccessLevel) select 0) < ExAd_VG_ACCESS_LEVEL) && (({alive _x}count playableUnits) >= ExAd_HACKING_MIN_PLAYERS_ONLINE))

View File

@ -36,6 +36,7 @@ if(isNil "ExAd_HACKING_FAILED_HACK")then{ExAd_VG_ACCESS_LEVEL = 1;}; /*Needs to
["STR_ExAd_HACKING_NOTI_MAX_TERRITORY_HACKS_REACHED", "Connection failed! Territory Wi-Fi is down!"] call ExAd_fnc_localize;
["STR_ExAd_HACKING_NOTI_TERRITORY_ONE_HACK", "Wi-Fi occupied!!"] call ExAd_fnc_localize;
["STR_ExAd_HACKING_NOTI_MAX_SIM_HACKS", "The laptop overloaded and got destroyed! Another hacker is already using the grid."] call ExAd_fnc_localize;
["STR_ExAd_HACKING_NOTI_NO_PLAYER_PRESENT", "No Wi-Fi available!"] call ExAd_fnc_localize;
["STR_ExAd_HACKING_HINT_TITLE", "Hack Activity"] call ExAd_fnc_localize;
["STR_ExAd_HACKING_HINT_HACK_START", "A brute force hack is detected on the grid!"] call ExAd_fnc_localize;
["STR_ExAd_HACKING_NOTI_VG_SUCCESS", "Hack successful! The Virtual Garage unloaded a %1"] call ExAd_fnc_localize;

View File

@ -86,6 +86,9 @@
<Key ID="STR_ExAd_HACKING_NOTI_MAX_SIM_HACKS">
<Original>The laptop overloaded and got destroyed! Another hacker is already using the grid.</Original>
</Key>
<Key ID="STR_ExAd_HACKING_NOTI_NO_PLAYER_PRESENT">
<Original>No Wi-Fi available!</Original>
</Key>
<Key ID="STR_ExAd_HACKING_NOTI_VG_SUCCESS">
<Original>Hack successful! The Virtual Garage unloaded a %1</Original> <!-- %1 indicates the vehicle class name that's going to be shown-->
</Key>