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 #1548 from githubmil/master

Browse Source 
Fix UAZ Cargo Upgrade & Balance Armor Upgrades & Fix L85A2 Price in config traders.
This commit is contained in:
Zupa
2015-07-01 23:49:54 +02:00
parent be8a9c9acc 309655a89b
commit f701affda8
12 changed files with 87 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
SQF/dayz_code/Configs/CfgVehicles/LAND/Lada.hpp
View File

@@ -502,7 +502,8 @@ class Lada2_TK_CIV_EP1_DZE1: Lada2_TK_CIV_EP1 {
// Armor 2
class Lada1_DZE2: Lada1_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -549,7 +550,8 @@ class Lada1_DZE2: Lada1_DZE1 {
};
};
class Lada2_DZE2: Lada2_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -596,7 +598,8 @@ class Lada2_DZE2: Lada2_DZE1 {
};
};
class LadaLM_DZE2: LadaLM_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -643,7 +646,8 @@ class LadaLM_DZE2: LadaLM_DZE1 {
};
};
class Lada1_TK_CIV_EP1_DZE2: Lada1_TK_CIV_EP1_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -690,7 +694,8 @@ class Lada1_TK_CIV_EP1_DZE2: Lada1_TK_CIV_EP1_DZE1 {
};
};
class Lada2_TK_CIV_EP1_DZE2: Lada2_TK_CIV_EP1_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;

3
SQF/dayz_code/Configs/CfgVehicles/LAND/Offroad_DSHKM.hpp
View File

@@ -360,7 +360,8 @@ class Offroad_DSHKM_Gue_DZE1: Offroad_DSHKM_Gue_DZE
// Armmor 2
class Offroad_DSHKM_Gue_DZE2: Offroad_DSHKM_Gue_DZE1
{
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints
{
class HitLFWheel: HitLFWheel

11
SQF/dayz_code/Configs/CfgVehicles/LAND/Pickup_PK.hpp
View File

@@ -146,7 +146,8 @@ class Pickup_PK_INS_DZE1: Pickup_PK_INS_DZE {
// Armor 2
class Pickup_PK_GUE_DZE2: Pickup_PK_GUE_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -193,7 +194,8 @@ class Pickup_PK_GUE_DZE2: Pickup_PK_GUE_DZE1 {
};
};
class Pickup_PK_TK_GUE_EP1_DZE2: Pickup_PK_TK_GUE_EP1_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -240,7 +242,8 @@ class Pickup_PK_TK_GUE_EP1_DZE2: Pickup_PK_TK_GUE_EP1_DZE1 {
};
};
class Pickup_PK_INS_DZE2: Pickup_PK_INS_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -325,4 +328,4 @@ class Pickup_PK_TK_GUE_EP1_DZE4: Pickup_PK_TK_GUE_EP1_DZE3 {
};
class Pickup_PK_INS_DZE4: Pickup_PK_INS_DZE3 {
fuelCapacity = 210; // car 100
};
};

35
SQF/dayz_code/Configs/CfgVehicles/LAND/SUV.hpp
View File

@@ -420,7 +420,8 @@ class SUV_Silver_DZE1: SUV_Silver {
// Armor 2
class SUV_TK_CIV_EP1_DZE2: SUV_TK_CIV_EP1_DZE1 {
armor = 50; // car 20
armor = 60; // car 20, SUV 25
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -467,7 +468,8 @@ class SUV_TK_CIV_EP1_DZE2: SUV_TK_CIV_EP1_DZE1 {
};
};
class SUV_Camo_DZE2: SUV_Camo_DZE1 {
armor = 50; // car 20
armor = 60; // car 20, SUV 25
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -514,7 +516,8 @@ class SUV_Camo_DZE2: SUV_Camo_DZE1 {
};
};
class SUV_Blue_DZE2: SUV_Blue_DZE1 {
armor = 50; // car 20
armor = 60; // car 20, SUV 25
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -561,7 +564,8 @@ class SUV_Blue_DZE2: SUV_Blue_DZE1 {
};
};
class SUV_Green_DZE2: SUV_Green_DZE1 {
armor = 50; // car 20
armor = 60; // car 20, SUV 25
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -608,7 +612,8 @@ class SUV_Green_DZE2: SUV_Green_DZE1 {
};
};
class SUV_Yellow_DZE2: SUV_Yellow_DZE1 {
armor = 50; // car 20
armor = 60; // car 20, SUV 25
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -655,7 +660,8 @@ class SUV_Yellow_DZE2: SUV_Yellow_DZE1 {
};
};
class SUV_Red_DZE2: SUV_Red_DZE1 {
armor = 50; // car 20
armor = 60; // car 20, SUV 25
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -702,7 +708,8 @@ class SUV_Red_DZE2: SUV_Red_DZE1 {
};
};
class SUV_White_DZE2: SUV_White_DZE1 {
armor = 50; // car 20
armor = 60; // car 20, SUV 25
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -749,7 +756,8 @@ class SUV_White_DZE2: SUV_White_DZE1 {
};
};
class SUV_Pink_DZE2: SUV_Pink_DZE1 {
armor = 50; // car 20
armor = 60; // car 20, SUV 25
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -796,7 +804,8 @@ class SUV_Pink_DZE2: SUV_Pink_DZE1 {
};
};
class SUV_Charcoal_DZE2: SUV_Charcoal_DZE1 {
armor = 50; // car 20
armor = 60; // car 20, SUV 25
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -843,7 +852,8 @@ class SUV_Charcoal_DZE2: SUV_Charcoal_DZE1 {
};
};
class SUV_Orange_DZE2: SUV_Orange_DZE1 {
armor = 50; // car 20
armor = 60; // car 20, SUV 25
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -890,7 +900,8 @@ class SUV_Orange_DZE2: SUV_Orange_DZE1 {
};
};
class SUV_Silver_DZE2: SUV_Silver_DZE1 {
armor = 50; // car 20
armor = 60; // car 20, SUV 25
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -1071,4 +1082,4 @@ class SUV_Orange_DZE4: SUV_Orange_DZE3 {
};
class SUV_Silver_DZE4: SUV_Silver_DZE3 {
fuelCapacity = 250; // suv base 130
};
};

14
SQF/dayz_code/Configs/CfgVehicles/LAND/Skoda.hpp
View File

@@ -304,7 +304,8 @@ class SkodaGreen_DZE1: SkodaGreen {
// Armor 2
class Skoda_DZE2: Skoda_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -351,7 +352,8 @@ class Skoda_DZE2: Skoda_DZE1 {
};
};
class SkodaBlue_DZE2: SkodaBlue_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -398,7 +400,8 @@ class SkodaBlue_DZE2: SkodaBlue_DZE1 {
};
};
class SkodaRed_DZE2: SkodaRed_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -445,7 +448,8 @@ class SkodaRed_DZE2: SkodaRed_DZE1 {
};
};
class SkodaGreen_DZE2: SkodaGreen_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -1290,4 +1294,4 @@ class car_sedan_DZE3: car_sedan_DZE2 {
// Fuel 4
class car_sedan_DZE4: car_sedan_DZE3 {
fuelCapacity = 210; // car 100
};
};

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

@@ -219,7 +219,7 @@ class UAZ_Unarmed_TK_CIV_EP1_DZE1: UAZ_Unarmed_TK_CIV_EP1 {
// Armor 2
class UAZ_CDF_DZE2: UAZ_CDF_DZE1 {
armor = 100; // UAZ 40
armor = 75; // UAZ 40
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
@@ -267,7 +267,7 @@ class UAZ_CDF_DZE2: UAZ_CDF_DZE1 {
};
};
class UAZ_INS_DZE2: UAZ_INS_DZE1 {
armor = 100; // UAZ 40
armor = 75; // UAZ 40
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
@@ -315,7 +315,7 @@ class UAZ_INS_DZE2: UAZ_INS_DZE1 {
};
};
class UAZ_RU_DZE2: UAZ_RU_DZE1 {
armor = 100; // UAZ 40
armor = 75; // UAZ 40
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
@@ -363,7 +363,7 @@ class UAZ_RU_DZE2: UAZ_RU_DZE1 {
};
};
class UAZ_Unarmed_TK_EP1_DZE2: UAZ_Unarmed_TK_EP1_DZE1 {
armor = 100; // UAZ 40
armor = 75; // UAZ 40
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
@@ -411,7 +411,7 @@ class UAZ_Unarmed_TK_EP1_DZE2: UAZ_Unarmed_TK_EP1_DZE1 {
};
};
class UAZ_Unarmed_UN_EP1_DZE2: UAZ_Unarmed_UN_EP1_DZE1 {
armor = 100; // UAZ 40
armor = 75; // UAZ 40
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
@@ -459,7 +459,7 @@ class UAZ_Unarmed_UN_EP1_DZE2: UAZ_Unarmed_UN_EP1_DZE1 {
};
};
class UAZ_Unarmed_TK_CIV_EP1_DZE2: UAZ_Unarmed_TK_CIV_EP1_DZE1 {
armor = 100; // UAZ 40
armor = 75; // UAZ 40
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
@@ -511,7 +511,7 @@ class UAZ_Unarmed_TK_CIV_EP1_DZE2: UAZ_Unarmed_TK_CIV_EP1_DZE1 {
class UAZ_CDF_DZE3: UAZ_CDF_DZE2 {
transportMaxWeapons = 20; // car 10
transportMaxMagazines = 100; // car 50
transportmaxbackpacks = 4; // car 2
transportmaxbackpacks = 9; // car 2, UAZ 7
class Upgrades {
ItemTNK[] = {"UAZ_CDF_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
@@ -520,7 +520,7 @@ class UAZ_CDF_DZE3: UAZ_CDF_DZE2 {
class UAZ_INS_DZE3: UAZ_INS_DZE2 {
transportMaxWeapons = 20; // car 10
transportMaxMagazines = 100; // car 50
transportmaxbackpacks = 4; // car 2
transportmaxbackpacks = 9; // car 2, UAZ 7
class Upgrades {
ItemTNK[] = {"UAZ_INS_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
@@ -529,7 +529,7 @@ class UAZ_INS_DZE3: UAZ_INS_DZE2 {
class UAZ_RU_DZE3: UAZ_RU_DZE2 {
transportMaxWeapons = 20; // car 10
transportMaxMagazines = 100; // car 50
transportmaxbackpacks = 4; // car 2
transportmaxbackpacks = 9; // car 2, UAZ 7
class Upgrades {
ItemTNK[] = {"UAZ_RU_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
@@ -538,7 +538,7 @@ class UAZ_RU_DZE3: UAZ_RU_DZE2 {
class UAZ_Unarmed_TK_EP1_DZE3: UAZ_Unarmed_TK_EP1_DZE2 {
transportMaxWeapons = 20; // car 10
transportMaxMagazines = 100; // car 50
transportmaxbackpacks = 4; // car 2
transportmaxbackpacks = 9; // car 2, UAZ 7
class Upgrades {
ItemTNK[] = {"UAZ_Unarmed_TK_EP1_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
@@ -547,7 +547,7 @@ class UAZ_Unarmed_TK_EP1_DZE3: UAZ_Unarmed_TK_EP1_DZE2 {
class UAZ_Unarmed_UN_EP1_DZE3: UAZ_Unarmed_UN_EP1_DZE2 {
transportMaxWeapons = 20; // car 10
transportMaxMagazines = 100; // car 50
transportmaxbackpacks = 4; // car 2
transportmaxbackpacks = 9; // car 2, UAZ 7
class Upgrades {
ItemTNK[] = {"UAZ_Unarmed_UN_EP1_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};
@@ -556,7 +556,7 @@ class UAZ_Unarmed_UN_EP1_DZE3: UAZ_Unarmed_UN_EP1_DZE2 {
class UAZ_Unarmed_TK_CIV_EP1_DZE3: UAZ_Unarmed_TK_CIV_EP1_DZE2 {
transportMaxWeapons = 20; // car 10
transportMaxMagazines = 100; // car 50
transportmaxbackpacks = 4; // car 2
transportmaxbackpacks = 9; // car 2, UAZ 7
class Upgrades {
ItemTNK[] = {"UAZ_Unarmed_TK_CIV_EP1_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}};

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

@@ -504,7 +504,8 @@ class VWGolf_DZE1: VWGolf {
// Armor 2
class VWGolf_DZE2: VWGolf_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -565,4 +566,4 @@ class VWGolf_DZE3: VWGolf_DZE2 {
// Fuel 4
class VWGolf_DZE4: VWGolf_DZE3 {
fuelCapacity = 210; // car 100
};
};

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

@@ -280,7 +280,7 @@ class Volha_2_TK_CIV_EP1_DZE1: Volha_2_TK_CIV_EP1 {
// Armor 2
class VolhaLimo_TK_CIV_EP1_DZE2: VolhaLimo_TK_CIV_EP1_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
@@ -328,7 +328,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 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
@@ -376,7 +376,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 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {

11
SQF/dayz_code/Configs/CfgVehicles/LAND/datsun.hpp
View File

@@ -96,7 +96,8 @@ class datsun1_civil_3_open_DZE1: datsun1_civil_3_open_DZE {
// Armor 2
class datsun1_civil_1_open_DZE2: datsun1_civil_1_open_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -144,7 +145,8 @@ class datsun1_civil_1_open_DZE2: datsun1_civil_1_open_DZE1 {
};
};
class datsun1_civil_2_covered_DZE2: datsun1_civil_2_covered_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -192,7 +194,8 @@ class datsun1_civil_2_covered_DZE2: datsun1_civil_2_covered_DZE1 {
};
};
class datsun1_civil_3_open_DZE2: datsun1_civil_3_open_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -293,4 +296,4 @@ class datsun1_civil_3_open_DZE4: datsun1_civil_3_open_DZE3 {
class Upgrades {
ItemARM[] = {"Pickup_PK_INS_DZE4",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
};
};
};

11
SQF/dayz_code/Configs/CfgVehicles/LAND/hilux.hpp
View File

@@ -96,7 +96,8 @@ class hilux1_civil_3_open_DZE1: hilux1_civil_3_open_DZE {
// Armor 2
class hilux1_civil_1_open_DZE2: hilux1_civil_1_open_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -144,7 +145,8 @@ class hilux1_civil_1_open_DZE2: hilux1_civil_1_open_DZE1 {
};
};
class hilux1_civil_2_covered_DZE2: hilux1_civil_2_covered_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -192,7 +194,8 @@ class hilux1_civil_2_covered_DZE2: hilux1_civil_2_covered_DZE1 {
};
};
class hilux1_civil_3_open_DZE2: hilux1_civil_3_open_DZE1 {
armor = 50; // car 20
armor = 55; // car 20
damageResistance = 0.02099;
class HitPoints: HitPoints {
class HitLFWheel: HitLFWheel {
armor = 0.3;
@@ -293,4 +296,4 @@ class hilux1_civil_3_open_DZE4: hilux1_civil_3_open_DZE3 {
class Upgrades {
ItemARM[] = {"Pickup_PK_INS_DZE4",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}};
};
};
};

4
SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyAssaultRifle.hpp
View File

@@ -106,7 +106,7 @@ class Category_485 {
};
class BAF_L85A2_RIS_Holo {
type = "trade_weapons";
buy[] = {9,"ItemGoldBar10oz"};
buy[] = {9,"ItemGoldBar"};
sell[] = {6,"ItemGoldBar"};
};
};
@@ -218,7 +218,7 @@ class Category_615 {
};
class BAF_L85A2_RIS_Holo {
type = "trade_weapons";
buy[] = {9,"ItemGoldBar10oz"};
buy[] = {9,"ItemGoldBar"};
sell[] = {6,"ItemGoldBar"};
};
};

4
SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralAssaultRifle.hpp
View File

@@ -106,7 +106,7 @@ class Category_602 {
};
class BAF_L85A2_RIS_Holo {
type = "trade_weapons";
buy[] = {9,"ItemGoldBar10oz"};
buy[] = {9,"ItemGoldBar"};
sell[] = {6,"ItemGoldBar"};
};
};
@@ -218,7 +218,7 @@ class Category_637 {
};
class BAF_L85A2_RIS_Holo {
type = "trade_weapons";
buy[] = {9,"ItemGoldBar10oz"};
buy[] = {9,"ItemGoldBar"};
sell[] = {6,"ItemGoldBar"};
};
};