W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-04 15:22:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add more _DZ versions of arma 2 weapons

Browse Source 
All Arma 2 weapons except the TWS and launchers have a _DZ version now. So it is no longer confusing which weapon version should be spawned. Always use the _DZ versions.
This commit is contained in:
AirwavesMan
2021-01-09 11:14:37 +01:00
parent 55152f7864
commit 9675e2301f
12 changed files with 92 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
View File

@@ -70,12 +70,12 @@ weaponsUS[] =
// Bolt action rifles and shotguns
{Loot_WEAPON, 5, Remington870_DZ},
{Loot_WEAPON, 5, AA12_PMC},
{Loot_WEAPON, 5, AA12_DZ},
// Sniper Rifles
{Loot_WEAPON, 5, M4SPR_DZE},
{Loot_WEAPON, 4, M40A3_DZ},
{Loot_WEAPON, 4, M24_des_EP1},
{Loot_WEAPON, 4, M24_Des_DZ},
{Loot_WEAPON, 4, M24_DZ},
{Loot_WEAPON, 3, DMR_DZ},
{Loot_WEAPON, 3, MK14_Sniper_DZ},
@@ -253,7 +253,7 @@ pistols[] = { // Residential spawns
{Loot_WEAPON, 1, DesertEagle_DZ},
{Loot_WEAPON, 5, Colt_Revolver_DZ},
{Loot_WEAPON, 5, Revolver_DZ},
{Loot_WEAPON, 1, revolver_gold_EP1},
{Loot_WEAPON, 1, Revolver_Gold_DZ},
{Loot_WEAPON, 2, Colt_Anaconda_DZ},
{Loot_WEAPON, 1, Colt_Anaconda_Gold_DZ},
{Loot_WEAPON, 2, Colt_Bull_DZ},

8
SQF/dayz_code/Configs/CfgMagazines/Magazines/Shotgun.hpp
View File

@@ -145,7 +145,8 @@ class 2Rnd_12Gauge_Buck : 8Rnd_12Gauge_Buck
class 20Rnd_B_AA12_74Slug : CA_Magazine
{
model = "\z\addons\dayz_epoch_w\magazine\dze_AA12_mag.p3d";
displayName = $STR_DZ_MAG_20Rnd_B_AA12_74Slug_NAME;
displayName = $STR_DZ_MAG_20Rnd_B_AA12_74Slug_NAME;
descriptionShort = $STR_DZ_MAG_20RND_12GAUGE_SLUG_DESC;
cartridgeName = "12Gauge_Slug";
class ItemActions
@@ -157,7 +158,8 @@ class 20Rnd_B_AA12_74Slug : CA_Magazine
class 20Rnd_B_AA12_Pellets : CA_Magazine
{
model = "\z\addons\dayz_epoch_w\magazine\dze_AA12_mag.p3d";
displayName = $STR_DZ_MAG_20Rnd_B_AA12_Pellets_NAME;
displayName = $STR_DZ_MAG_20Rnd_B_AA12_Pellets_NAME;
descriptionShort = $STR_DZ_MAG_20RND_12GAUGE_BUCK_DESC;
cartridgeName = "12Gauge_Pellets";
class ItemActions
@@ -170,6 +172,7 @@ class 20Rnd_B_AA12_HE : CA_Magazine
{
model = "\z\addons\dayz_epoch_w\magazine\dze_AA12_mag.p3d";
displayName = $STR_DZ_MAG_20Rnd_B_AA12_HE_NAME;
descriptionShort = $STR_DZ_MAG_20RND_12GAUGE_HE_DESC;
cartridgeName = "19mm_HE";
class ItemActions
@@ -201,6 +204,7 @@ class 8Rnd_B_Saiga12_Pellets: CA_Magazine
};
};
//USAS 12 Ammo
class 20Rnd_B_Usas12_74Slug: 8Rnd_B_Saiga12_74Slug {
displayName = $STR_DZ_MAG_20RND_USAS12_SLUG_NAME;
descriptionShort = $STR_DZ_MAG_20RND_USAS12_SLUG_DESC;

4
SQF/dayz_code/Configs/CfgServerTrader/Category/BlackMarket.hpp
View File

@@ -3,9 +3,9 @@ class Category_11 {
class MeleeBaseballbatBarbed {type = "trade_weapons";buy[] = {-2,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
class MeleeBaseballbatNails {type = "trade_weapons";buy[] = {-2,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};};
class Saiga12K_DZ {type = "trade_weapons";buy[] = {3,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};
class AA12_PMC {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {5,"ItemGoldBar"};};
class AA12_DZ {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {5,"ItemGoldBar"};};
class USAS12_DZ {type = "trade_weapons";buy[] = {7,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};};
class revolver_gold_EP1 {type = "trade_weapons";buy[] = {5,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};
class Revolver_Gold_DZ {type = "trade_weapons";buy[] = {5,"ItemGoldBar10oz"};sell[] = {2,"ItemGoldBar10oz"};};
class Colt_Anaconda_Gold_DZ {type = "trade_weapons";buy[] = {9,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar10oz"};};
class SVD_Gold_DZ {type = "trade_weapons";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};};
class AKS_GOLD {type = "trade_weapons";buy[] = {-8,"ItemGoldBar10oz"};sell[] = {4,"ItemGoldBar10oz"};};

2
SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp
View File

@@ -641,7 +641,7 @@ class Category_17 {
class M24_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};};
class M24_Gh_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {7,"ItemGoldBar"};};
// desert camo
class M24_des_EP1 {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};};
class M24_Des_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};};
class M40A3_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar10oz"};sell[] = {6,"ItemGoldBar"};};
class M40A3_Gh_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar10oz"};sell[] = {7,"ItemGoldBar"};};
// iron sights

4
SQF/dayz_code/Configs/CfgServerTraderZSC/Category/BlackMarket.hpp
View File

@@ -3,9 +3,9 @@ class Category_11 {
class MeleeBaseballbatBarbed {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {2,"worth"};};
class MeleeBaseballbatNails {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {2,"worth"};};
class Saiga12K_DZ {type = "trade_weapons";buy[] = {300,"worth"};sell[] = {100,"worth"};};
class AA12_PMC {type = "trade_weapons";buy[] = {800,"worth"};sell[] = {500,"worth"};};
class AA12_DZ {type = "trade_weapons";buy[] = {800,"worth"};sell[] = {500,"worth"};};
class USAS12_DZ {type = "trade_weapons";buy[] = {700,"worth"};sell[] = {400,"worth"};};
class revolver_gold_EP1 {type = "trade_weapons";buy[] = {5000,"worth"};sell[] = {2000,"worth"};};
class Revolver_Gold_DZ {type = "trade_weapons";buy[] = {5000,"worth"};sell[] = {2000,"worth"};};
class Colt_Anaconda_Gold_DZ {type = "trade_weapons";buy[] = {9000,"worth"};sell[] = {5000,"worth"};};
class SVD_Gold_DZ {type = "trade_weapons";buy[] = {10000,"worth"};sell[] = {5000,"worth"};};
class AKS_GOLD {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {4000,"worth"};};

2
SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp
View File

@@ -641,7 +641,7 @@ class Category_17 {
class M24_DZ {type = "trade_weapons";buy[] = {1000,"worth"};sell[] = {600,"worth"};};
class M24_Gh_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {700,"worth"};};
// desert camo
class M24_des_EP1 {type = "trade_weapons";buy[] = {1000,"worth"};sell[] = {600,"worth"};};
class M24_Des_DZ {type = "trade_weapons";buy[] = {1000,"worth"};sell[] = {600,"worth"};};
class M40A3_DZ {type = "trade_weapons";buy[] = {1000,"worth"};sell[] = {600,"worth"};};
class M40A3_Gh_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {700,"worth"};};
// iron sights

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

@@ -200,6 +200,7 @@ class CfgWeapons
#include "Rifles\Remington870.hpp"
#include "Rifles\Saiga12.hpp"
#include "Rifles\Usas12.hpp"
#include "Rifles\AA12.hpp"
#include "Rifles\Crossbow.hpp"
#include "Rifles\L115A3.hpp"
#include "Rifles\MSR.hpp"

8
SQF/dayz_code/Configs/CfgWeapons/Pistols/Revolver.hpp
View File

@@ -1,4 +1,10 @@
class Revolver_DZ : revolver_EP1
class Revolver_DZ: revolver_EP1
{
magazines[] = {6Rnd_45ACP};
};
class revolver_gold_EP1;
class Revolver_Gold_DZ: revolver_gold_EP1
{
magazines[] = {6Rnd_45ACP};
};

4
SQF/dayz_code/Configs/CfgWeapons/Rifles/AA12.hpp Normal file
View File

@@ -0,0 +1,4 @@
class AA12_PMC;
class AA12_DZ: AA12_PMC {
magazines[] = {"20Rnd_B_AA12_Pellets","20Rnd_B_AA12_74Slug","20Rnd_B_AA12_HE"};
};

5
SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS.hpp
View File

@@ -8,4 +8,7 @@ class AKS_Silver_DZ: AKM_DZ {
displayName = $STR_DZ_WPN_AKS_SILVER_NAME;
model = "\RH_aks\RH_aks47s.p3d";
picture = "\RH_aks\inv\aks47s.paa";
};
};
class AK_47_S;
class AKS_DZ: AK_47_S {};

8
SQF/dayz_code/Configs/CfgWeapons/Rifles/M24.hpp
View File

@@ -30,4 +30,12 @@ class M24_Gh_DZ : M24_DZ
script = "; ['Attachment_Ghillie',_id,'M24_DZ'] call player_removeAttachment";
};
};
};
class M24_des_EP1;
class M24_DES_DZ : M24_des_EP1
{
displayName = $STR_DZ_WPN_M24_DESERT_NAME;
magazines[] = {5Rnd_762x51_M24};
};