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

Merge pull request #13 from vbawol/master

Browse Source 
merge
This commit is contained in:
Uro1
2014-08-22 20:56:27 +01:00
parent dccbb19131 740f4144f1
commit 9984923462
5 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
SQF/dayz_code/Configs/CfgVehicles/LAND/UAZ.hpp
View File

@@ -219,7 +219,8 @@ class UAZ_Unarmed_TK_CIV_EP1_DZE1: UAZ_Unarmed_TK_CIV_EP1 {
// Armor 2 // Armor 2
class UAZ_CDF_DZE2: UAZ_CDF_DZE1 { class UAZ_CDF_DZE2: UAZ_CDF_DZE1 {
armor = 50; // car 20 armor = 100; // UAZ 40
damageResistance = 0.02099;
class HitPoints: HitPoints { class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel { class HitLFWheel: HitLFWheel {
armor = 0.3; armor = 0.3;
@@ -266,7 +267,8 @@ class UAZ_CDF_DZE2: UAZ_CDF_DZE1 {
}; };
}; };
class UAZ_INS_DZE2: UAZ_INS_DZE1 { class UAZ_INS_DZE2: UAZ_INS_DZE1 {
armor = 50; // car 20 armor = 100; // UAZ 40
damageResistance = 0.02099;
class HitPoints: HitPoints { class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel { class HitLFWheel: HitLFWheel {
armor = 0.3; armor = 0.3;
@@ -313,7 +315,8 @@ class UAZ_INS_DZE2: UAZ_INS_DZE1 {
}; };
}; };
class UAZ_RU_DZE2: UAZ_RU_DZE1 { class UAZ_RU_DZE2: UAZ_RU_DZE1 {
armor = 50; // car 20 armor = 100; // UAZ 40
damageResistance = 0.02099;
class HitPoints: HitPoints { class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel { class HitLFWheel: HitLFWheel {
armor = 0.3; armor = 0.3;
@@ -360,7 +363,8 @@ class UAZ_RU_DZE2: UAZ_RU_DZE1 {
}; };
}; };
class UAZ_Unarmed_TK_EP1_DZE2: UAZ_Unarmed_TK_EP1_DZE1 { class UAZ_Unarmed_TK_EP1_DZE2: UAZ_Unarmed_TK_EP1_DZE1 {
armor = 50; // car 20 armor = 100; // UAZ 40
damageResistance = 0.02099;
class HitPoints: HitPoints { class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel { class HitLFWheel: HitLFWheel {
armor = 0.3; armor = 0.3;
@@ -407,7 +411,8 @@ class UAZ_Unarmed_TK_EP1_DZE2: UAZ_Unarmed_TK_EP1_DZE1 {
}; };
}; };
class UAZ_Unarmed_UN_EP1_DZE2: UAZ_Unarmed_UN_EP1_DZE1 { class UAZ_Unarmed_UN_EP1_DZE2: UAZ_Unarmed_UN_EP1_DZE1 {
armor = 50; // car 20 armor = 100; // UAZ 40
damageResistance = 0.02099;
class HitPoints: HitPoints { class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel { class HitLFWheel: HitLFWheel {
armor = 0.3; armor = 0.3;
@@ -454,7 +459,8 @@ class UAZ_Unarmed_UN_EP1_DZE2: UAZ_Unarmed_UN_EP1_DZE1 {
}; };
}; };
class UAZ_Unarmed_TK_CIV_EP1_DZE2: UAZ_Unarmed_TK_CIV_EP1_DZE1 { class UAZ_Unarmed_TK_CIV_EP1_DZE2: UAZ_Unarmed_TK_CIV_EP1_DZE1 {
armor = 50; // car 20 armor = 100; // UAZ 40
damageResistance = 0.02099;
class HitPoints: HitPoints { class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel { class HitLFWheel: HitLFWheel {
armor = 0.3; armor = 0.3;

5
SQF/dayz_code/Configs/CfgVehicles/LAND/Volha.hpp
View File

@@ -281,6 +281,7 @@ class Volha_2_TK_CIV_EP1_DZE1: Volha_2_TK_CIV_EP1 {
// Armor 2 // Armor 2
class VolhaLimo_TK_CIV_EP1_DZE2: VolhaLimo_TK_CIV_EP1_DZE1 { class VolhaLimo_TK_CIV_EP1_DZE2: VolhaLimo_TK_CIV_EP1_DZE1 {
armor = 50; // car 20 armor = 50; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints { class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel { class HitLFWheel: HitLFWheel {
armor = 0.3; armor = 0.3;
@@ -328,6 +329,7 @@ class VolhaLimo_TK_CIV_EP1_DZE2: VolhaLimo_TK_CIV_EP1_DZE1 {
}; };
class Volha_1_TK_CIV_EP1_DZE2: Volha_1_TK_CIV_EP1_DZE1 { class Volha_1_TK_CIV_EP1_DZE2: Volha_1_TK_CIV_EP1_DZE1 {
armor = 50; // car 20 armor = 50; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints { class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel { class HitLFWheel: HitLFWheel {
armor = 0.3; armor = 0.3;
@@ -375,6 +377,7 @@ class Volha_1_TK_CIV_EP1_DZE2: Volha_1_TK_CIV_EP1_DZE1 {
}; };
class Volha_2_TK_CIV_EP1_DZE2: Volha_2_TK_CIV_EP1_DZE1 { class Volha_2_TK_CIV_EP1_DZE2: Volha_2_TK_CIV_EP1_DZE1 {
armor = 50; // car 20 armor = 50; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints { class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel { class HitLFWheel: HitLFWheel {
armor = 0.3; armor = 0.3;
@@ -459,4 +462,4 @@ class Volha_1_TK_CIV_EP1_DZE4: Volha_1_TK_CIV_EP1_DZE3 {
}; };
class Volha_2_TK_CIV_EP1_DZE4: Volha_2_TK_CIV_EP1_DZE3 { class Volha_2_TK_CIV_EP1_DZE4: Volha_2_TK_CIV_EP1_DZE3 {
fuelCapacity = 210; // car 100 fuelCapacity = 210; // car 100
}; };

2
SQF/dayz_code/actions/player_build.sqf
View File

@@ -137,7 +137,7 @@ _findNearestPole = [];
_IsNearPlot = count (_findNearestPole); _IsNearPlot = count (_findNearestPole);
// If item is plot pole && another one exists within 45m // If item is plot pole && another one exists within 45m
if(_isPole && _IsNearPlot > 0) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_44") , "PLAIN DOWN"]; }; if(_isPole && _IsNearPlot > 0) exitWith { DZE_ActionInProgress = false; cutText [(format [localize "str_epoch_player_44", DZE_PlotPole select 1]) , "PLAIN DOWN"]; };
if(_IsNearPlot == 0) then { if(_IsNearPlot == 0) then {

2
SQF/dayz_code/actions/player_build_plotCheck.sqf
View File

@@ -67,7 +67,7 @@ _passArray = [_IsNearPlot,_nearestPole,_ownerID,_friendlies]; //create new array
// End script if item is plot pole and another one exists within defined radius // End script if item is plot pole and another one exists within defined radius
if(_isPole && _IsNearPlot > 0) exitWith { if(_isPole && _IsNearPlot > 0) exitWith {
DZE_ActionInProgress = false; DZE_ActionInProgress = false;
cutText [(localize "str_epoch_player_44") , "PLAIN DOWN"]; cutText [(format [localize "str_epoch_player_44", DZE_PlotPole select 1]) , "PLAIN DOWN"];
_passArray _passArray
}; };

14
SQF/dayz_epoch_b/stringtable.xml
View File

@@ -3147,14 +3147,14 @@
<Czech>Nelze stavět v boji.</Czech> <Czech>Nelze stavět v boji.</Czech>
</Key> </Key>
<Key ID="STR_EPOCH_PLAYER_44"> <Key ID="STR_EPOCH_PLAYER_44">
<Original>Cannot build plot pole within 45m of an existing plot.</Original> <Original>Cannot build plot pole within %1m of an existing plot.</Original>
<English>Cannot build plot pole within 45m of an existing plot.</English> <English>Cannot build plot pole within %1m of an existing plot.</English>
<German>Grundstück-Markierung kann nicht innerhalb 45m von einem bestehenden Grundstück erbaut werden.</German> <German>Grundstück-Markierung kann nicht innerhalb %1m von einem bestehenden Grundstück erbaut werden.</German>
<Russian>Нельзя построить столб в пределах 45м. от существующего столба.</Russian> <Russian>Нельзя построить столб в пределах %1м. от существующего столба.</Russian>
<!-- <Spanish></Spanish> --> <!-- <Spanish></Spanish> -->
<Dutch>Kan bouw-paal niet bouwen op minder als 45m afstand van een bestaand bouwterrein.</Dutch> <Dutch>Kan bouw-paal niet bouwen op minder als %1m afstand van een bestaand bouwterrein.</Dutch>
<French>Impossible de construire un panneau de propriété privée à moins de 45m d'un autre panneau du genre.</French> <French>Impossible de construire un panneau de propriété privée à moins de %1m d'un autre panneau du genre.</French>
<Czech>Nelze postavit hraniční značku ve vzdálenosti 45 metrů od jiné značky.</Czech> <Czech>Nelze postavit hraniční značku ve vzdálenosti %1 metrů od jiné značky.</Czech>
</Key> </Key>
<Key ID="STR_EPOCH_PLAYER_45"> <Key ID="STR_EPOCH_PLAYER_45">
<Original>PgUp to raise or PgDn to lower (Hold ALT to raise faster or CTRL slower), Q or E to flip 180. Space-Bar to build.</Original> <Original>PgUp to raise or PgDn to lower (Hold ALT to raise faster or CTRL slower), Q or E to flip 180. Space-Bar to build.</Original>