diff --git a/SQF/dayz_code/actions/vault_pitch.sqf b/SQF/dayz_code/actions/vault_pitch.sqf deleted file mode 100644 index f583fdcbf..000000000 --- a/SQF/dayz_code/actions/vault_pitch.sqf +++ /dev/null @@ -1,160 +0,0 @@ -/* - DayZ Safe - Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com. -*/ -private ["_tent","_location","_isOk","_cancel","_location3","_location4","_location1","_location2","_counter","_pondPos","_isPond","_ppos","_hastentitem","_dir","_building","_isBuilding","_playerPos","_item","_offset_x","_offset_y","_offset_z","_offset_z_attach","_config","_text","_tmpvault","_vault_location","_objectsPond","_combination_1","_combination_2","_combination_3","_combination_4","_combination","_removed"]; -//check if can pitch here - -if (dayz_actionInProgress) exitWith {localize "str_epoch_player_108" call dayz_rollingMessages;}; -dayz_actionInProgress = true; - -_playerPos = getPosATL player; -_item = _this; -_hastentitem = _this in magazines player; -_offset_x = 0; -_offset_y = 1.5; -_offset_z = 0; -_offset_z_attach = 0.5; -_location = player modeltoworld [_offset_x,_offset_y,_offset_z]; -// Allow placement anywhere. -_isOk = true; - -//diag_log ("Pitch Tent: " + str(_isok) ); - -_config = configFile >> "CfgMagazines" >> _item; -_text = getText (_config >> "displayName"); - -if (!_hastentitem) exitWith {format[localize "str_player_31",_text,"pitch"] call dayz_rollingMessages;}; - -// blocked -// Allow on concrete since we dont force to ground. -// if (["concrete",dayz_surfaceType] call fnc_inString) then { _isOk = true; diag_log ("surface concrete"); }; - -//diag_log ("Pitch Tent: " + str(_isok) ); -_dir = getDir player; - -// Start Preview loop -_tmpvault = createVehicle ["VaultStorageLocked", _location, [], 0, "CAN_COLLIDE"]; -_tmpvault setdir _dir; -_tmpvault attachTo [player,[_offset_x,_offset_y,_offset_z_attach]]; -_cancel = false; -_counter = 0; - -while {_isOk} do { - if(_counter == 0) then { - localize "str_epoch_player_109" call dayz_rollingMessages; - uiSleep 5; - _location1 = getPosATL player; - uiSleep 5; - _location2 = getPosATL player; - - if(_location1 distance _location2 < 0.1) exitWith { - - localize "str_epoch_player_109" call dayz_rollingMessages; - _location3 = getPosATL player; - uiSleep 5; - _location4 = getPosATL player; - - if(_location3 distance _location4 > 0.1) exitWith { - _isOk = false; - _cancel = true; - }; - - _isOk = false; - }; - }; - if(_counter >= 1) exitWith { - _isOk = false; - _cancel = true; - }; - _counter = _counter + 1; -}; - -detach _tmpvault; -_vault_location = (getPosATL _tmpvault); - -// Make sure vault is not placed on road. -if (isOnRoad _vault_location) then { _isOk = true; }; -// Make sure vault is not placed in trader citys -if(!canbuild) then { _isOk = true; }; - -//Block Tents in pounds -_objectsPond = nearestObjects [_playerPos, [], 10]; - { - _isPond = ["pond",str(_x),false] call fnc_inString; - if (_isPond) then { - _pondPos = (_x worldToModel _playerPos) select 2; - if (_pondPos < 0) then { - _isOk = true; - }; - }; - } count _objectsPond; - -deleteVehicle _tmpvault; - -if(!_cancel) then { - if (!_isOk) then { - - //remove safe - - _hastentitem = _this in magazines player; - if (!_hastentitem) exitWith {format[localize "str_player_31",_text,"pitch"] call dayz_rollingMessages;}; - - _removed = ([player,_item] call BIS_fnc_invRemove); - - if(_removed == 1) then { - _dir = round(direction player); - ["Working",0,[20,40,15,0]] call dayz_NutritionSystem; - //wait a bit - player playActionNow "Medic"; - uiSleep 1; - [player,"tentunpack",0,false] call dayz_zombieSpeak; - - [player,50,true,(getPosATL player)] spawn player_alertZombies; - - _building = nearestObject [(vehicle player), "HouseBase"]; - _isBuilding = [(vehicle player),_building] call fnc_isInsideBuilding; - - if(_isBuilding) then { - - _ppos = _building worldToModel _vault_location; - _location = _building modelToWorld _ppos; - - } else { - _location = player modelToWorld [_offset_x,_offset_y,_offset_z]; - }; - - uiSleep 5; - //place tent (local) - _tent = createVehicle ["VaultStorageLocked", _location, [], 0, "CAN_COLLIDE"]; - _tent setdir _dir; - _tent setpos _location; - player reveal _tent; - - // Generate Combination - _combination_1 = floor(random 10); - _combination_2 = floor(random 10); - _combination_3 = floor(random 10); - _combination_4 = floor(random 10); - - // Format Combination - _combination = format["%1%2%3%4",_combination_1,_combination_2,_combination_3,_combination_4]; - - _tent setVariable ["CharacterID",_combination,true]; - _tent setVariable ["OEMPos",_location,true]; - - PVDZ_obj_Publish = [_combination,_tent,[_dir,_location,dayz_playerUID],[]]; - publicVariableServer "PVDZ_obj_Publish"; - - format[localize "str_epoch_player_179",_combination] call dayz_rollingMessages; - }; - - } else { - localize "str_epoch_player_110" call dayz_rollingMessages; - }; - -} else { - localize "str_epoch_player_111" call dayz_rollingMessages; -}; - -dayz_actionInProgress = false; \ No newline at end of file diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index 5d0bc7d8f..93b50ead5 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -196,7 +196,6 @@ if (!isDedicated) then { player_unlockDoor = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_unlockDoor.sqf"; player_unlockVault = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_unlockVault.sqf"; player_upgradeVehicle = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_upgradeVehicle.sqf"; - player_vaultPitch = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\vault_pitch.sqf"; PlotGetFriends = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotGetFriends.sqf"; PlotNearbyHumans = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotNearbyHumans.sqf"; PlotAddFriend = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\plotManagement\plotAddFriend.sqf"; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 5cae1e832..a48334cb9 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -11803,37 +11803,6 @@ Vous n'avez pas assez de place dans votre ceinture. Nemáte dostatek místa na Vašem opasku na nářadí. - - Vault pitching already in progress. - Platzieren des Tresors bereits im Gange. - Сейф уже устанавливается. - Kluis installatie is al bezig. - L'installation du coffre fort est déjà en cours. - Pokládání sejfu již probíhá. - - - Planning construction stand still 5 seconds to build. - Platzieren des Tresors gestartet, warte 5 Sekunden um den Aufbau zu starten. - Планирование строительства стойте на месте 5 секунд, чтобы построить. - Het bouwen wordt voorbereid, sta 5 seconden stil om te bouwen. - Planification de la construction, restez immobile 5 secondes pour construire. - Pokládání sejfu začalo, vyčkejte 5 sekund pro postavení. - - - You cannot place a Safe here. The area must be flat, and free of other objects - Du kannst hier kein Tresor aufbauen. Der Untergrund muss flach und frei von Hindernissen sein - Вы не можете разместить сейф здесь. Область должна быть плоской, и свободной от других объектов - Vous ne pouvez pas placer le coffre fort ici. L'endroit doit être plat et dégagé. - Zde nemůžete postavit sejf. Místo musí být rovné a bez objektů - - - Canceled construction of Safe. - Platzieren des Tresors abgebrochen. - Строительство сейфа отменено. - Het bouwen van de kluis is stopgezet. - Mise en place du coffre fort annulée. - Stavění sejfu zrušeno. - You cannot lock this %1, you do not know the combination. Du kannst nicht diese(n) %1 abschließen, da du nicht die Kombination kennst. @@ -12155,13 +12124,6 @@ %1 is losgemaakt van de sleepwagen. %1 byl odháknut z odtahového vozidla. - - You have setup your Safe. Combination is %1 - Dein Tresor wurde aufgestellt. Die Kombination lautet: %1 - Вы установили свой сейф. Комбинация %1 - Je hebt je kluis geinstalleerd. De code is %1 - Nastavil jste svůj sejf. Kombinace je %1 - Bought %3 for %1 %2. Du hast für %1 %2 ein %3 gekauft. diff --git a/SQF/dayz_server/compile/server_publishObject.sqf b/SQF/dayz_server/compile/server_publishObject.sqf index 309c41691..7db44c56e 100644 --- a/SQF/dayz_server/compile/server_publishObject.sqf +++ b/SQF/dayz_server/compile/server_publishObject.sqf @@ -6,7 +6,7 @@ _characterID = _this select 0; _object = _this select 1; _worldspace = _this select 2; _inventory = _this select 3; -if (typeName _inventory != "ARRAY") then {_inventory = [];}; //Temp fix for error in vault_pitch, player_build.sqf in 1.0.6 release +if (typeName _inventory != "ARRAY") then {_inventory = [];}; //Temp fix for error in player_build.sqf in 1.0.6 release _type = typeOf _object; if ([_object, "Server"] call check_publishobject) then { diff --git a/Server Files/Battleye/scripts.txt b/Server Files/Battleye/scripts.txt index 241f1d2a7..fbea047bb 100644 --- a/Server Files/Battleye/scripts.txt +++ b/Server Files/Battleye/scripts.txt @@ -4,7 +4,7 @@ 5 "allMissionObjects" !"allMissionObjects \"RoadFlare\"" !"allMissionObjects \"ChemLight\"" !"[_x,2,0,false,false] spawn BIS_Effects_Burn;\n};\n} count allMissionObjects \"SpawnableWreck\";" !"if (isNull _grp) then { _grp = group ((allmissionobjects 'FunctionsManager') select 0); };" 5 "allowDammage" 5 "allUnits" !"} count allUnits;\nlbSort _playerList;" !"if (getPlayerUID _x == _this) exitWith {\n_player = _x;\n};\n} count allUnits;" !"owner _x publicVariableClient \"PVDZ_groupInvite\";\n};\n} count allUnits;" -5 "attachTo" !"riation),((random (_variation * 2)) - _variation)];\n_bolt attachTo [_hitObject,_val,_hitMemoryPt];\n_dir = ([_hitObject,_unit]" !"select 3;\nplayer playActionNow \"PutDown\";\nuiSleep 2;\n_flare attachTo [player,[0,0,0],\"granat2\"];\n[_flare, -90, -10] call object" !"tchmove \"ainjpfalmstpsnonwrfldnon_carried_still\";\n_dragee attachto [_unit,[-0.2, 0.2, 0]];\n\n\nwhile {r_carry_sqf} do\n{\n_anim_n" !"0, 0.1], 0, 0, 10];\n_source setDropInterval 0.02;\n_point attachTo [_unit,_modelPos,_wound];\n};\n\nuiSleep 5;\n\nwhile {((_unit getV" !"_objGhost attachTo [_object, [0, 0, 0.7]];\n};\n\n_boundingBox = boundingBox" !" attachto [_v,[0,0,0],\"destructionEffect" !"rag = [_dragee];\npublicVariable \"PVDZ_drg_RaDrag\";\n\n_dragee attachto [_unit,[0.1, 1.01, 0]];\nuiSleep 0.02;\n\n\n\n\n_dragee setDir 180;" !"_objectHelper attachTo [player,_offset];" !"_object attachTo [player,_offset];\n\n_position = getPosATL _object;" !="_vehicle attachTo [_liftHeli,[0,0,-7]];" !="_obj attachTo [_axis];" !"_objectSnapGizmo attachTo [_object,[_x select 0,_x select 1,_x select 2]];" !="_vehicle attachTo [_towTruck,[1.3,-2,2.3]];" !="_tmpvault attachTo [player,[_offset_x,_offset_y,_offset_z_attach]];" !"localize \"STR_EPOCH_ACTIONS_ATTACHTOHELI\"," !="_l1 attachTo [_lh,[0,0,0],\"light\"];" +5 "attachTo" !"riation),((random (_variation * 2)) - _variation)];\n_bolt attachTo [_hitObject,_val,_hitMemoryPt];\n_dir = ([_hitObject,_unit]" !"select 3;\nplayer playActionNow \"PutDown\";\nuiSleep 2;\n_flare attachTo [player,[0,0,0],\"granat2\"];\n[_flare, -90, -10] call object" !"tchmove \"ainjpfalmstpsnonwrfldnon_carried_still\";\n_dragee attachto [_unit,[-0.2, 0.2, 0]];\n\n\nwhile {r_carry_sqf} do\n{\n_anim_n" !"0, 0.1], 0, 0, 10];\n_source setDropInterval 0.02;\n_point attachTo [_unit,_modelPos,_wound];\n};\n\nuiSleep 5;\n\nwhile {((_unit getV" !"_objGhost attachTo [_object, [0, 0, 0.7]];\n};\n\n_boundingBox = boundingBox" !" attachto [_v,[0,0,0],\"destructionEffect" !"rag = [_dragee];\npublicVariable \"PVDZ_drg_RaDrag\";\n\n_dragee attachto [_unit,[0.1, 1.01, 0]];\nuiSleep 0.02;\n\n\n\n\n_dragee setDir 180;" !"_objectHelper attachTo [player,_offset];" !"_object attachTo [player,_offset];\n\n_position = getPosATL _object;" !="_vehicle attachTo [_liftHeli,[0,0,-7]];" !="_obj attachTo [_axis];" !"_objectSnapGizmo attachTo [_object,[_x select 0,_x select 1,_x select 2]];" !="_vehicle attachTo [_towTruck,[1.3,-2,2.3]];" !"localize \"STR_EPOCH_ACTIONS_ATTACHTOHELI\"," !="_l1 attachTo [_lh,[0,0,0],\"light\"];" 5 "buttonSetAction" 5 "callExtension" 5 "closeDisplay" !"'closeDisplay'" !"closeDisplay 0" !"closeDisplay 2" !"if (!isNil \"closeDisplay\") then {"