W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 20:13:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

update fork

Browse Source
This commit is contained in:
W0LF
2021-02-08 18:23:57 +03:00
parent fb6e733d62
commit d9065e8766
8 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SQF/dayz_code/Configs/CfgExtra/snappoints.hpp
View File

@@ -241,10 +241,10 @@ class SnapBuilding {
class WoodFloorStairs_DZ: FloorsWallsStairs { class WoodFloorStairs_DZ: FloorsWallsStairs {
points[] = { points[] = {
{0,0,0,$STR_EPOCH_ACTION_SNAP_PIVOT}, {0,0,0,$STR_EPOCH_ACTION_SNAP_PIVOT},
{0,-2.32,3.14,$STR_EPOCH_ACTION_SNAP_BACK}, {0,-2.32,3.114,$STR_EPOCH_ACTION_SNAP_BACK},
{0,2.32,3.14,$STR_EPOCH_ACTION_SNAP_FRONT}, {0,2.32,3.114,$STR_EPOCH_ACTION_SNAP_FRONT},
{-2.54,0,3.14,$STR_EPOCH_ACTION_SNAP_LEFT}, {-2.52,0,3.114,$STR_EPOCH_ACTION_SNAP_LEFT},
{2.48,0,3.14,$STR_EPOCH_ACTION_SNAP_RIGHT} {2.46,0,3.114,$STR_EPOCH_ACTION_SNAP_RIGHT}
}; };
}; };
class Wood_Floor_Stairs_Preview_DZ: WoodFloorStairs_DZ {}; class Wood_Floor_Stairs_Preview_DZ: WoodFloorStairs_DZ {};

4
SQF/dayz_code/Configs/CfgVehicles/Car/MiniCooper.hpp
View File

@@ -228,6 +228,10 @@ class Mini_Cooper_DZE: Mini_Cooper_base
{ {
scope = 2; scope = 2;
displayname = "$STR_VEH_NAME_MINI_COOPER"; displayname = "$STR_VEH_NAME_MINI_COOPER";
class Upgrades {
ItemORP[] = {"Mini_Cooper_DZE1",{"ItemToolbox"},{},{{"ItemORP",1},{"PartEngine",1},{"PartWheel",4},{"ItemScrews",2}}};
};
}; };
// Performance 1 // Performance 1

1
SQF/dayz_code/Configs/CfgWeapons/Rifles/G3.hpp
View File

@@ -48,4 +48,5 @@ class G3_DZ: FNFAL_DZ
maxRange = 15; maxRange = 15;
maxRangeProbab = 0.05; maxRangeProbab = 0.05;
}; };
class Attachments {};
}; };

3
SQF/dayz_code/Configs/CfgWeapons/Rifles/SVD.hpp
View File

@@ -163,6 +163,8 @@ class SVD_NSPU_DZ : SVD_PSO1_DZ {
script = "; ['Attachment_NSPU',_id,'SVD_DZ'] call player_removeAttachment"; script = "; ['Attachment_NSPU',_id,'SVD_DZ'] call player_removeAttachment";
}; };
}; };
class Attachments {};
}; };
class SVD_Gold_DZ : SVD_PSO1_DZ { class SVD_Gold_DZ : SVD_PSO1_DZ {
@@ -171,4 +173,5 @@ class SVD_Gold_DZ : SVD_PSO1_DZ {
picture = "\RH_aks\inv\svdg.paa"; picture = "\RH_aks\inv\svdg.paa";
class ItemActions {}; class ItemActions {};
class Attachments {};
}; };

1
SQF/dayz_code/Configs/CfgWeapons/Rifles/SVU.hpp
View File

@@ -7,4 +7,5 @@ class SVU_PSO1_DZ: SVD_PSO1_DZ {
soundBegin[] = {"begin1",1}; soundBegin[] = {"begin1",1};
magazines[] = {"10Rnd_762x54_SVD"}; magazines[] = {"10Rnd_762x54_SVD"};
class ItemActions {}; class ItemActions {};
class Attachments {};
}; };

4
SQF/dayz_code/compile/snap_functions.sqf
View File

@@ -52,7 +52,7 @@ fnc_initSnapPoints = {
snapGizmos = []; 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 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]]; _objectSnapGizmo attachTo [_object,[_x select 0,_x select 1,_x select 2]];
snapGizmos set [count snapGizmos,_objectSnapGizmo]; snapGizmos set [count snapGizmos,_objectSnapGizmo];
@@ -76,7 +76,7 @@ fnc_initSnapPointsNearby = {
_pointsNearby = getArray (configFile >> "SnapBuilding" >> (typeOf _x) >> "points"); _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 setobjecttexture [0,"#(argb,8,8,3)color(0.04,0.84,0.92,0.3,ca)"];
_objectSnapGizmo setDir (_nearbyObject getVariable["memDir",0]); _objectSnapGizmo setDir (_nearbyObject getVariable["memDir",0]);
_posNearby = _nearbyObject modelToWorld [_x select 0,_x select 1,_x select 2]; _posNearby = _nearbyObject modelToWorld [_x select 0,_x select 1,_x select 2];

6
SQF/dayz_code/medical/transfusion.sqf
View File

@@ -14,6 +14,8 @@ if (time - dayz_lastTransfusion > 120) then {dayz_bloodBagHumanity = 300;}; //Re
_badBag = false; _badBag = false;
_wholeBag = false; _wholeBag = false;
//Unconscious timeout for receiving unit
_duration = [2,3] select ((_unit getVariable ["USEC_BloodQty",0]) <= 4000);
if (!dayz_classicBloodBagSystem) then { if (!dayz_classicBloodBagSystem) then {
_bloodType = _unit getVariable ["blood_type", ""]; //Get receiving units blood type _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 //End if the player does not have a transfusion kit
//if (!_hasTransfusionKit) exitWith { localize "str_actions_medical_transfusion_failed_transfusionkit" call dayz_rollingMessages; }; //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"]; _bloodBagArrayNeeded = ["bloodBagONEG"];
if (_bloodTestdone) then { // if the recipient does not know his blood type, only O- can apply if (_bloodTestdone) then { // if the recipient does not know his blood type, only O- can apply

24
SQF/dayz_code/stringtable.xml
View File

@@ -4850,10 +4850,10 @@
<Key ID="STR_EQUIP_DESC_M9SD"> <Key ID="STR_EQUIP_DESC_M9SD">
<English>Suppressed semi-automatic pistol &lt;br/&gt;Caliber: 9x19mm SD</English> <English>Suppressed semi-automatic pistol &lt;br/&gt;Caliber: 9x19mm SD</English>
<Russian>Полуавтоматический пистолет с глушителем&lt;br/&gt;Калибр: 9x19мм дозвук.</Russian> <Russian>Полуавтоматический пистолет с глушителем&lt;br/&gt;Калибр: 9x19мм дозвук.</Russian>
<Spanish>Pistola silenciada semi-automática&lt;br/&gt;Calibre: 9x19mm</Spanish> <Spanish>Pistola silenciada semi-automática&lt;br/&gt;Calibre: 9x19mm SD</Spanish>
<French>Pistolet semi-automatique italien avec silencieux &lt;br/&gt;Calibre: 9x19mm</French> <French>Pistolet semi-automatique italien avec silencieux &lt;br/&gt;Calibre: 9x19mm SD</French>
<Czech>Poloautomatická pistole s tlumičem &lt;br/&gt;Kalibr: 9x19mm</Czech> <Czech>Poloautomatická pistole s tlumičem &lt;br/&gt;Kalibr: 9x19mm SD</Czech>
<German>Halbautomatische Pistole vom Typ Beretta 92, Militärversion mit Schalldämpfer&lt;br/&gt;Kaliber: 9 x 19 mm</German> <German>Halbautomatische Pistole vom Typ Beretta 92, Militärversion mit Schalldämpfer&lt;br/&gt;Kaliber: 9x19mm SD</German>
</Key> </Key>
<Key ID="STR_EQUIP_NAME_M1911"> <Key ID="STR_EQUIP_NAME_M1911">
<English>Colt M1911</English> <English>Colt M1911</English>
@@ -4888,10 +4888,10 @@
<Key ID="STR_EQUIP_DESC_Makarov_SD"> <Key ID="STR_EQUIP_DESC_Makarov_SD">
<English>Suppressed semi-automatic pistol &lt;br/&gt;Caliber: 9x18mm SD</English> <English>Suppressed semi-automatic pistol &lt;br/&gt;Caliber: 9x18mm SD</English>
<Russian>Полуавтоматический пистолет с глушителем&lt;br/&gt;Калибр: 9x18мм дозвук.</Russian> <Russian>Полуавтоматический пистолет с глушителем&lt;br/&gt;Калибр: 9x18мм дозвук.</Russian>
<Spanish>Pistola silenciada semi-automática &lt;br/&gt;Calibre: 9x18mm</Spanish> <Spanish>Pistola silenciada semi-automática &lt;br/&gt;Calibre: 9x18mm SD</Spanish>
<French>Pistolet semi-automatique russe avec silencieux &lt;br/&gt;Calibre: 9x18mm</French> <French>Pistolet semi-automatique russe avec silencieux &lt;br/&gt;Calibre: 9x18mm SD</French>
<Czech>Ruská poloautomatická pistole s tlumičem &lt;br/&gt;Kalibr: 9x18mm</Czech> <Czech>Ruská poloautomatická pistole s tlumičem &lt;br/&gt;Kalibr: 9x18mm</Czech>
<German>Halbautomatische Pistole vom Typ Makarow mit Schalldämpfer (Typ PB)&lt;br/&gt;Kaliber: 9 x 18 mm Makarow</German> <German>Halbautomatische Pistole vom Typ Makarow mit Schalldämpfer (Typ PB)&lt;br/&gt;Kaliber: 9x18mm SD</German>
</Key> </Key>
<Key ID="STR_EQUIP_NAME_PDW"> <Key ID="STR_EQUIP_NAME_PDW">
<English>PDW</English> <English>PDW</English>
@@ -20172,12 +20172,12 @@
<Hungarian>Kaliber: 5.7x28mm SD&lt;br/&gt; Töltények: 50 &lt;br/&gt; Hozzá tartozó fegyver: P90 SD</Hungarian> <Hungarian>Kaliber: 5.7x28mm SD&lt;br/&gt; Töltények: 50 &lt;br/&gt; Hozzá tartozó fegyver: P90 SD</Hungarian>
</Key> </Key>
<Key ID="STR_DZ_MAG_20RND_HK417_NAME"> <Key ID="STR_DZ_MAG_20RND_HK417_NAME">
<English>30Rnd. HK417 mag.</English> <English>20Rnd. HK417 mag.</English>
<Russian>30п. HK417 маг.</Russian> <Russian>20п. HK417 маг.</Russian>
</Key> </Key>
<Key ID="STR_DZ_MAG_20RND_HK417SD_NAME"> <Key ID="STR_DZ_MAG_20RND_HK417SD_NAME">
<English>30Rnd. HK417 SD mag.</English> <English>20Rnd. HK417 SD mag.</English>
<Russian>30п. HK417 дозвук. маг.</Russian> <Russian>20п. HK417 дозвук. маг.</Russian>
</Key> </Key>
<Key ID="STR_DZ_MAG_20RND_HK417_DESC"> <Key ID="STR_DZ_MAG_20RND_HK417_DESC">
<English>Caliber: 7.62x51mm&lt;br/&gt;Rounds: 20&lt;br/&gt;Used in: HK417</English> <English>Caliber: 7.62x51mm&lt;br/&gt;Rounds: 20&lt;br/&gt;Used in: HK417</English>
@@ -37602,4 +37602,4 @@
<German>Warnung: Dieses Fahrzeug wird bei Server-Neustart gelöscht!</German> <German>Warnung: Dieses Fahrzeug wird bei Server-Neustart gelöscht!</German>
</Key> </Key>
</Package> </Package>
</Project> </Project>