From d9065e8766f604054423ae40d40513a43aade5f7 Mon Sep 17 00:00:00 2001 From: W0LF Date: Mon, 8 Feb 2021 18:23:57 +0300 Subject: [PATCH] update fork --- SQF/dayz_code/Configs/CfgExtra/snappoints.hpp | 8 +++---- .../Configs/CfgVehicles/Car/MiniCooper.hpp | 4 ++++ .../Configs/CfgWeapons/Rifles/G3.hpp | 1 + .../Configs/CfgWeapons/Rifles/SVD.hpp | 3 +++ .../Configs/CfgWeapons/Rifles/SVU.hpp | 1 + SQF/dayz_code/compile/snap_functions.sqf | 4 ++-- SQF/dayz_code/medical/transfusion.sqf | 6 ++--- SQF/dayz_code/stringtable.xml | 24 +++++++++---------- 8 files changed, 30 insertions(+), 21 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp b/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp index 8810c269d..d00f9394f 100644 --- a/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp +++ b/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp @@ -241,10 +241,10 @@ class SnapBuilding { class WoodFloorStairs_DZ: FloorsWallsStairs { points[] = { {0,0,0,$STR_EPOCH_ACTION_SNAP_PIVOT}, - {0,-2.32,3.14,$STR_EPOCH_ACTION_SNAP_BACK}, - {0,2.32,3.14,$STR_EPOCH_ACTION_SNAP_FRONT}, - {-2.54,0,3.14,$STR_EPOCH_ACTION_SNAP_LEFT}, - {2.48,0,3.14,$STR_EPOCH_ACTION_SNAP_RIGHT} + {0,-2.32,3.114,$STR_EPOCH_ACTION_SNAP_BACK}, + {0,2.32,3.114,$STR_EPOCH_ACTION_SNAP_FRONT}, + {-2.52,0,3.114,$STR_EPOCH_ACTION_SNAP_LEFT}, + {2.46,0,3.114,$STR_EPOCH_ACTION_SNAP_RIGHT} }; }; class Wood_Floor_Stairs_Preview_DZ: WoodFloorStairs_DZ {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/MiniCooper.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/MiniCooper.hpp index d79e72ade..89c9a2971 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/MiniCooper.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/MiniCooper.hpp @@ -228,6 +228,10 @@ class Mini_Cooper_DZE: Mini_Cooper_base { scope = 2; displayname = "$STR_VEH_NAME_MINI_COOPER"; + + class Upgrades { + ItemORP[] = {"Mini_Cooper_DZE1",{"ItemToolbox"},{},{{"ItemORP",1},{"PartEngine",1},{"PartWheel",4},{"ItemScrews",2}}}; + }; }; // Performance 1 diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G3.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G3.hpp index d09d2abe9..60fb27f1d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G3.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G3.hpp @@ -48,4 +48,5 @@ class G3_DZ: FNFAL_DZ maxRange = 15; maxRangeProbab = 0.05; }; + class Attachments {}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/SVD.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/SVD.hpp index c31893b96..46a9fc579 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/SVD.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/SVD.hpp @@ -163,6 +163,8 @@ class SVD_NSPU_DZ : SVD_PSO1_DZ { script = "; ['Attachment_NSPU',_id,'SVD_DZ'] call player_removeAttachment"; }; }; + + class Attachments {}; }; class SVD_Gold_DZ : SVD_PSO1_DZ { @@ -171,4 +173,5 @@ class SVD_Gold_DZ : SVD_PSO1_DZ { picture = "\RH_aks\inv\svdg.paa"; class ItemActions {}; + class Attachments {}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/SVU.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/SVU.hpp index 9daed7a28..955c28107 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/SVU.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/SVU.hpp @@ -7,4 +7,5 @@ class SVU_PSO1_DZ: SVD_PSO1_DZ { soundBegin[] = {"begin1",1}; magazines[] = {"10Rnd_762x54_SVD"}; class ItemActions {}; + class Attachments {}; }; \ No newline at end of file diff --git a/SQF/dayz_code/compile/snap_functions.sqf b/SQF/dayz_code/compile/snap_functions.sqf index bef124c46..b795cfa3c 100644 --- a/SQF/dayz_code/compile/snap_functions.sqf +++ b/SQF/dayz_code/compile/snap_functions.sqf @@ -52,7 +52,7 @@ fnc_initSnapPoints = { snapGizmos = []; { - _objectSnapGizmo = "Sign_sphere10cm_EP1" createVehicleLocal [0,0,0]; + _objectSnapGizmo = "Sign_sphere10cm_EP1" createVehicle [0,0,0]; _objectSnapGizmo setobjecttexture [0,"#(argb,8,8,3)color(0.04,0.84,0.92,0.3,ca)"]; _objectSnapGizmo attachTo [_object,[_x select 0,_x select 1,_x select 2]]; snapGizmos set [count snapGizmos,_objectSnapGizmo]; @@ -76,7 +76,7 @@ fnc_initSnapPointsNearby = { _pointsNearby = getArray (configFile >> "SnapBuilding" >> (typeOf _x) >> "points"); { - _objectSnapGizmo = "Sign_sphere10cm_EP1" createVehicleLocal [0,0,0]; + _objectSnapGizmo = "Sign_sphere10cm_EP1" createVehicle [0,0,0]; _objectSnapGizmo setobjecttexture [0,"#(argb,8,8,3)color(0.04,0.84,0.92,0.3,ca)"]; _objectSnapGizmo setDir (_nearbyObject getVariable["memDir",0]); _posNearby = _nearbyObject modelToWorld [_x select 0,_x select 1,_x select 2]; diff --git a/SQF/dayz_code/medical/transfusion.sqf b/SQF/dayz_code/medical/transfusion.sqf index e16cd42c7..8700ac1c4 100644 --- a/SQF/dayz_code/medical/transfusion.sqf +++ b/SQF/dayz_code/medical/transfusion.sqf @@ -14,6 +14,8 @@ if (time - dayz_lastTransfusion > 120) then {dayz_bloodBagHumanity = 300;}; //Re _badBag = false; _wholeBag = false; +//Unconscious timeout for receiving unit +_duration = [2,3] select ((_unit getVariable ["USEC_BloodQty",0]) <= 4000); if (!dayz_classicBloodBagSystem) then { _bloodType = _unit getVariable ["blood_type", ""]; //Get receiving units blood type @@ -24,9 +26,7 @@ if (!dayz_classicBloodBagSystem) then { //End if the player does not have a transfusion kit //if (!_hasTransfusionKit) exitWith { localize "str_actions_medical_transfusion_failed_transfusionkit" call dayz_rollingMessages; }; - - //Unconscious timeout for receiving unit - _duration = [2,3] select (_unit getVariable ["USEC_BloodQty", 0]); + _bloodBagArrayNeeded = ["bloodBagONEG"]; if (_bloodTestdone) then { // if the recipient does not know his blood type, only O- can apply diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 247281def..d34e7d803 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -4850,10 +4850,10 @@ Suppressed semi-automatic pistol <br/>Caliber: 9x19mm SD Полуавтоматический пистолет с глушителем<br/>Калибр: 9x19мм дозвук. - Pistola silenciada semi-automática<br/>Calibre: 9x19mm - Pistolet semi-automatique italien avec silencieux <br/>Calibre: 9x19mm - Poloautomatická pistole s tlumičem <br/>Kalibr: 9x19mm - Halbautomatische Pistole vom Typ Beretta 92, Militärversion mit Schalldämpfer<br/>Kaliber: 9 x 19 mm + Pistola silenciada semi-automática<br/>Calibre: 9x19mm SD + Pistolet semi-automatique italien avec silencieux <br/>Calibre: 9x19mm SD + Poloautomatická pistole s tlumičem <br/>Kalibr: 9x19mm SD + Halbautomatische Pistole vom Typ Beretta 92, Militärversion mit Schalldämpfer<br/>Kaliber: 9x19mm SD Colt M1911 @@ -4888,10 +4888,10 @@ Suppressed semi-automatic pistol <br/>Caliber: 9x18mm SD Полуавтоматический пистолет с глушителем<br/>Калибр: 9x18мм дозвук. - Pistola silenciada semi-automática <br/>Calibre: 9x18mm - Pistolet semi-automatique russe avec silencieux <br/>Calibre: 9x18mm + Pistola silenciada semi-automática <br/>Calibre: 9x18mm SD + Pistolet semi-automatique russe avec silencieux <br/>Calibre: 9x18mm SD Ruská poloautomatická pistole s tlumičem <br/>Kalibr: 9x18mm - Halbautomatische Pistole vom Typ Makarow mit Schalldämpfer (Typ PB)<br/>Kaliber: 9 x 18 mm Makarow + Halbautomatische Pistole vom Typ Makarow mit Schalldämpfer (Typ PB)<br/>Kaliber: 9x18mm SD PDW @@ -20172,12 +20172,12 @@ Kaliber: 5.7x28mm SD<br/> Töltények: 50 <br/> Hozzá tartozó fegyver: P90 SD - 30Rnd. HK417 mag. - 30п. HK417 маг. + 20Rnd. HK417 mag. + 20п. HK417 маг. - 30Rnd. HK417 SD mag. - 30п. HK417 дозвук. маг. + 20Rnd. HK417 SD mag. + 20п. HK417 дозвук. маг. Caliber: 7.62x51mm<br/>Rounds: 20<br/>Used in: HK417 @@ -37602,4 +37602,4 @@ Warnung: Dieses Fahrzeug wird bei Server-Neustart gelöscht! - + \ No newline at end of file