Add more _DZ versions of arma 2 weapons

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

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},

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;

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"};};

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

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"};};

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

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"

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};
};

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"};
};

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 {};

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};
};

View File

@@ -2332,8 +2332,8 @@
<Czech>Ostrá jehla</Czech>
</Key>
<Key ID="STR_ITEM_NAME_equip_nails">
<English>Nails</English>
<German>Nägel</German>
<English>Box of nails</English>
<German>Schachtel mit Nägeln</German>
<Russian>Гвозди</Russian>
<Spanish>Clavos</Spanish>
<French>Clous</French>
@@ -15348,6 +15348,10 @@
<Russian>M24 (Камуфляж)</Russian>
<German>M24 Tarn</German>
</Key>
<Key ID="STR_DZ_WPN_M24_DESERT_NAME">
<English>M24 Desert</English>
<German>M24 Wüstentarn</German>
</Key>
<Key ID="STR_DZ_WPN_M40A3_NAME">
<English>M40A3</English>
</Key>
@@ -18401,12 +18405,12 @@
<Czech>2 patrony Slug</Czech>
</Key>
<Key ID="STR_DZ_MAG_2RND_12GAUGE_SLUG_DESC">
<English>Caliber: 12 gauge &lt;br/&gt;Rounds: 2 &lt;br/&gt;Used in: M1014, Remington 870, Double-barreled Shotgun</English>
<Russian>Патрон: 12-й калибр &lt;br/&gt;Количество: 2 &lt;br/&gt;Используется в: M1014, Ремингтон 870, Двустволках</Russian>
<Spanish>Calibre: 12 gauge &lt;br/&gt;Rondas: 2 &lt;br/&gt;Usada en: M1014, Remington 870, Escopeta de doble cañon</Spanish>
<French>Calibre: 12&lt;br/&gt;Munitions: 2&lt;br/&gt;Pour: M1014, Remington 870, Fusil à 2 coups</French>
<Czech>Ráže: 12 &lt;br/&gt;Munice: 2 &lt;br/&gt;Pro: M1014, Remington 870, Dvouhlavňová brokovnice</Czech>
<German>Kaliber: 12 Flintenlaufgeschoss&lt;br/&gt;2 Schuss&lt;br/&gt;Verwendet in: M1014, Remington 870, Doppelläufige Schrotflinte</German>
<English>Caliber: 12 Slug&lt;br/&gt;Rounds: 2 &lt;br/&gt;Used in: Double-barreled Shotgun</English>
<Russian>Патрон: 12-й калибр &lt;br/&gt;Количество: 2 &lt;br/&gt;Используется в: Двустволках</Russian>
<Spanish>Calibre: 12 Slug &lt;br/&gt;Rondas: 2 &lt;br/&gt;Usada en: Escopeta de doble cañon</Spanish>
<French>Calibre: 12 Slug&lt;br/&gt;Munitions: 2&lt;br/&gt;Pour:Fusil à 2 coups</French>
<Czech>Ráže: 12 Slug&lt;br/&gt;Munice: 2 &lt;br/&gt;Pro: Dvouhlavňová brokovnice</Czech>
<German>Kaliber: 12 Slug&lt;br/&gt;Patronen: 2&lt;br/&gt;Verwendet in: Doppelläufige Schrotflinte</German>
</Key>
<Key ID="STR_DZ_MAG_2RND_12GAUGE_BUCK_NAME">
<English>2Rnd. 12Cal. Pellets</English>
@@ -18417,12 +18421,12 @@
<German>2Rnd. 12Cal. Schrot</German>
</Key>
<Key ID="STR_DZ_MAG_2RND_12GAUGE_BUCK_DESC">
<English>Caliber: 12 gauge &lt;br/&gt;Rounds: 2&lt;br/&gt;Used in: M1014, Remington 870, Double-barreled Shotgun</English>
<English>Caliber: 12 Buckshot &lt;br/&gt;Rounds: 2&lt;br/&gt;Used in: M1014, Remington 870, Double-barreled Shotgun</English>
<Russian>Патрон: 12-й калибр &lt;br/&gt;Количество: 2 &lt;br/&gt;Используется в: M1014, Ремингтон 870, Двустволках</Russian>
<Spanish>Calibre: 12 gauge &lt;br/&gt;Rondas: 2&lt;br/&gt;Usada en: M1014, Remington 870, Escopeta de doble cañon</Spanish>
<French>Calibre: 12&lt;br/&gt;Munitions: 2&lt;br/&gt;Pour: M1014, Remington 870, Fusil à 2 coups</French>
<Czech>Ráže: 12&lt;br/&gt;Munice: 2&lt;br/&gt;Pro: M1014, Remington 870, Dvouhlavňová brokovnice</Czech>
<German>Kaliber 12 Schrotmunition&lt;br/&gt;2&lt;br/&gt;Verwendet in: M1014, Remington 870, Doppelläufige Schrotflinte</German>
<Spanish>Calibre: 12 Buckshot &lt;br/&gt;Rondas: 2&lt;br/&gt;Usada en: M1014, Remington 870, Escopeta de doble cañon</Spanish>
<French>Calibre: 12 Buckshot&lt;br/&gt;Munitions: 2&lt;br/&gt;Pour: M1014, Remington 870, Fusil à 2 coups</French>
<Czech>Ráže: 12 Buckshot&lt;br/&gt;Munice: 2&lt;br/&gt;Pro: M1014, Remington 870, Dvouhlavňová brokovnice</Czech>
<German>Kaliber: 12 Schrot&lt;br/&gt;Patronen: 2&lt;br/&gt;Verwendet in: M1014, Remington 870, Doppelläufige Schrotflinte</German>
</Key>
<Key ID="STR_DZ_MAG_8RND_12GAUGE_SLUG_NAME">
<English>8Rnd. 12 Cal. Slug</English>
@@ -18437,7 +18441,7 @@
<Spanish>Calibre: 12 gauge &lt;br/&gt;Rondas: 8 &lt;br/&gt;Usada en: M1014, Remington 870</Spanish>
<French>Calibre: 12&lt;br/&gt;Munitions: 8&lt;br/&gt;Pour: M1014, Remington 870</French>
<Czech>Ráže: 12 &lt;br/&gt;Munice: 8 &lt;br/&gt;Pro: M1014, Remington 870</Czech>
<German>Kaliber 12 Flintenlaufgeschoss&lt;br/&gt;8 Schuss&lt;br/&gt;Verwendet in: M1014, Remington 870</German>
<German>Kaliber: 12 Slug&lt;br/&gt;Patronen: 8&lt;br/&gt;Verwendet in: M1014, Remington 870</German>
</Key>
<Key ID="STR_DZ_MAG_8RND_12GAUGE_BUCK_NAME">
<English>8Rnd. 12Cal. Pellets</English>
@@ -18448,12 +18452,12 @@
<German>8Rnd. 12Cal. Schrot</German>
</Key>
<Key ID="STR_DZ_MAG_8RND_12GAUGE_BUCK_DESC">
<English>Caliber: 12 gauge &lt;br/&gt;Rounds: 8&lt;br/&gt;Used in: M1014, Remington 870</English>
<English>Caliber: 12 Buckshot &lt;br/&gt;Rounds: 8&lt;br/&gt;Used in: M1014, Remington 870</English>
<Russian>Патрон: 12-й калибр &lt;br/&gt;Количество: 8 &lt;br/&gt;Используется в: M1014, Ремингтон 870</Russian>
<Spanish>Calibre: 12 gauge &lt;br/&gt;Rondas: 8&lt;br/&gt;Usada en: M1014, Remington 870</Spanish>
<French>Calibre: 12&lt;br/&gt;Munitions: 8&lt;br/&gt;Pour: M1014, Remington 870</French>
<Czech>Ráže: 12&lt;br/&gt;Munice: 8&lt;br/&gt;Pro: M1014, Remington 870</Czech>
<German>Kaliber 12 Schrotmunition&lt;br/&gt;8&lt;br/&gt;Verwendet in: M1014, Remington 870</German>
<Spanish>Calibre: 12 Buckshot &lt;br/&gt;Rondas: 8&lt;br/&gt;Usada en: M1014, Remington 870</Spanish>
<French>Calibre: 12 Buckshot&lt;br/&gt;Munitions: 8&lt;br/&gt;Pour: M1014, Remington 870</French>
<Czech>Ráže: 12 Buckshot&lt;br/&gt;Munice: 8&lt;br/&gt;Pro: M1014, Remington 870</Czech>
<German>Kaliber: 12 Schrot&lt;br/&gt;Patronen: 8&lt;br/&gt;Verwendet in: M1014, Remington 870</German>
</Key>
<Key ID="STR_DZ_MAG_30RND_MP5_DESC">
<German>Kaliber: 9x19mm Parabellum &lt;br/&gt;Patronen: 30 &lt;br/&gt;Verwendet in: MP5, Scorpion Evo 3</German>
@@ -19154,19 +19158,29 @@
<Hungarian>Kaliber: 9x39mm &lt;br/&gt; Töltények: 10&lt;br/&gt; Hozzá tartozó fegyver: VSS Vintorez, AS VAL</Hungarian>
</Key>
<Key ID="STR_DZ_MAG_20Rnd_B_AA12_74Slug_NAME">
<English>20Rnd. 12 Cal. Slug.</English>
<German>20 Schuss Kal. 12 Flintenlaufgeschoss</German>
<Russian>20п. 12к (пуля)</Russian>
<English>20Rnd. AA-12 Slug</English>
<Russian>20п. AA-12 (пуля)</Russian>
</Key>
<Key ID="STR_DZ_MAG_20Rnd_B_AA12_Pellets_NAME">
<English>20Rnd. 12 Cal. Pellets.</English>
<German>20 Schuss Kal. 12 Schrot</German>
<Russian>20п. 12к (дробь)</Russian>
<English>20Rnd. AA-12 Pellets</English>
<Russian>20п. AA-12 (дробь)</Russian>
</Key>
<Key ID="STR_DZ_MAG_20Rnd_B_AA12_HE_NAME">
<English>20Rnd. 19mm HE.</English>
<Russian>20п. 19мм HE</Russian>
<English>20Rnd. AA-12 HE.</English>
<Russian>20п. AA-12 HE</Russian>
</Key>
<Key ID="STR_DZ_MAG_20RND_12GAUGE_SLUG_DESC">
<English>Caliber: 12 Slug &lt;br/&gt;Rounds: 20 &lt;br/&gt;Used in: AA-12</English>
<German>Kaliber 12 Slug &lt;br/&gt;Patronen: 20&lt;br/&gt;Verwendet in: AA-12</German>
</Key>
<Key ID="STR_DZ_MAG_20RND_12GAUGE_BUCK_DESC">
<English>Caliber: 12 Buckshot &lt;br/&gt;Rounds: 20&lt;br/&gt;Used in: AA-12</English>
<German>Kaliber 12 Schrot &lt;br/&gt;Patronen: 20&lt;br/&gt;Verwendet in: AA-12</German>
</Key>
<Key ID="STR_DZ_MAG_20RND_12GAUGE_HE_DESC">
<English>Caliber: 12 HE &lt;br/&gt;Rounds: 20&lt;br/&gt;Used in: AA-12</English>
<German>Kaliber: 12 HE &lt;br/&gt;Patronen: 20&lt;br/&gt;Verwendet in: AA-12</German>
</Key>
<Key ID="STR_DZ_MAG_10Rnd_762x51_CZ750_NAME">
<English>10Rnd. CZ 750 mag.</English>
<Russian>10п. CZ 750 маг.</Russian>
@@ -32219,6 +32233,18 @@
<Key ID="STR_EPOCH_PLANT_PATCH_POTATO">
<English>Potato patch</English>
<German>Kartoffelbeet</German>
</Key>
<Key ID="STR_EPOCH_PLANT_PATCH_HEMP">
<English>Hemp plant patch</English>
<German>Hanfpflanzenbeet</German>
</Key>
<Key ID="STR_EPOCH_PLANT_PATCH_TOBACCO">
<English>Tobacco plant patch</English>
<German>Tabakpflanzenbeet</German>
</Key>
<Key ID="STR_EPOCH_PLANT_PATCH_TEA">
<English>Tea plant patch</English>
<German>Teepflanzenbeet</German>
</Key>
<!--Fix for missing strings from the buildings3.pbo, this is just a placeholder-->