This commit is contained in:
A Man
2020-02-29 02:48:19 +01:00
parent 31d4c8b44f
commit 7304131f10
15 changed files with 373 additions and 3 deletions

View File

@@ -175,6 +175,8 @@ AmmoEU[] =
{Loot_MAGAZINE, 6, 30Rnd_9x19_TMPSD},
{Loot_MAGAZINE, 6, 25Rnd_45ACP_UMP},
{Loot_MAGAZINE, 6, 25Rnd_45ACP_UMPSD},
{Loot_MAGAZINE, 6, 50Rnd_57x28_P90},
{Loot_MAGAZINE, 6, 50Rnd_57x28_P90SD},
// Assault rifles
{Loot_MAGAZINE, 10, 30Rnd_556x45_G36},

View File

@@ -48,6 +48,7 @@ AttachmentsEU[] =
{Loot_MAGAZINE, 1, Attachment_Sup9},
{Loot_MAGAZINE, 1, Attachment_Sup10},
{Loot_MAGAZINE, 1, Attachment_Sup45},
{Loot_MAGAZINE, 1, Attachment_Sup57},
{Loot_MAGAZINE, 1, Attachment_MFL},
{Loot_MAGAZINE, 1, Attachment_MFL_Pist} // G17 only
};

View File

@@ -135,6 +135,8 @@ weaponsEU[] =
{Loot_WEAPON, 7, TMP_SD_DZ},
{Loot_WEAPON, 7, UMP_DZ},
{Loot_WEAPON, 7, UMP_SD_DZ},
{Loot_WEAPON, 7, P90_DZ},
{Loot_WEAPON, 7, P90_SD_DZ},
// Assault Rifles
{Loot_WEAPON, 5, G36A_Camo_DZ},

View File

@@ -18,6 +18,7 @@
#include "Sup9.hpp"
#include "Sup10.hpp"
#include "Sup57.hpp"
#include "Sup68.hpp"
#include "Sup556.hpp"
#include "Sup545.hpp"

View File

@@ -0,0 +1,21 @@
class Attachment_Sup57 : CA_Magazine
{
scope = public;
count = 1;
type = WeaponSlotItem;
model = "\z\addons\dayz_communityweapons\attachments\suppressor556\suppressor556.p3d";
picture = "\z\addons\dayz_communityweapons\attachments\suppressor556\data\m_suppressor556_ca.paa";
displayName = $STR_DZ_ATT_SUP57_NAME;
descriptionShort = $STR_DZ_ATT_SUP57_DESC;
class ItemActions
{
class AttachToPrimary
{
text = $STR_DZ_ATT_ACT_TO_PRIMARY;
script = "; [_id,1] call player_attachAttachment";
};
};
};

View File

@@ -0,0 +1,28 @@
//P90
class 50Rnd_57x28_P90: CA_Magazine
{
scope = public;
displayName = $STR_DZ_MAG_50RND_P90_NAME;
descriptionShort = $STR_DZ_MAG_50RND_P90_DESC;
model = "\RH_smg\mags\mag_p90.p3d";
picture = "\RH_smg\inv\m_p90.paa";
count = 50;
ammo = "B_57x28_Ball";
cartridgeName = "5.7x28";
class ItemActions
{
COMBINE_MAG
};
};
class 50Rnd_57x28_P90SD: 50Rnd_57x28_P90
{
displayName = $STR_DZ_MAG_50RND_P90SD_NAME;
descriptionShort = $STR_DZ_MAG_50RND_P90SD_DESC;
picture = "\RH_smg\inv\m_p90.paa";
ammo = "B_57x28_SD";
cartridgeName = "5.7x28_SD";
};

View File

@@ -22,6 +22,7 @@
#include "762x51.hpp" //M240, FN FAL, DMR, M24
#include "762x54r.hpp" //PK, SVD, Mosin
#include "46x30.hpp" //MP7
#include "57x28.hpp" //P90
#include "680x43.hpp" //ACR
#include "86x70.hpp" //L115, MSR
#include "762x67.hpp" //XM2010

View File

@@ -41,11 +41,13 @@ class Category_20 {
class 64Rnd_9x19_Bizon {type = "trade_items";buy[] = {2,"ItemSilverBar10oz"};sell[] = {1,"ItemSilverBar10oz"};};
class 64Rnd_9x19_SD_Bizon {type = "trade_items";buy[] = {4,"ItemSilverBar10oz"};sell[] = {2,"ItemSilverBar10oz"};};
class 40Rnd_46x30_mp7 {type = "trade_items";buy[] = {2,"ItemSilverBar10oz"};sell[] = {1,"ItemSilverBar10oz"};};
class 40Rnd_46x30_sd_mp7 {type = "trade_items";buy[] = {4,"ItemSilverBar10oz"};sell[] = {2,"ItemSilverBar10oz"};};
class 40Rnd_46x30_sd_mp7 {type = "trade_items";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};};
class 33Rnd_45ACP_KRISS {type = "trade_items";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};};
class 33Rnd_45ACP_KRISSSD {type = "trade_items";buy[] = {2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};
class 25Rnd_45ACP_UMP {type = "trade_items";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};};
class 25Rnd_45ACP_UMPSD {type = "trade_items";buy[] = {2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};
class 50Rnd_57x28_P90 {type = "trade_items";buy[] = {4,"ItemSilverBar10oz"};sell[] = {2,"ItemSilverBar10oz"};};
class 50Rnd_57x28_P90SD {type = "trade_items";buy[] = {2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};};
};
//Single-shot/Shotgun Ammo

View File

@@ -23,6 +23,7 @@ class Category_12 {
class Attachment_Sup545 {type = "trade_items";buy[] = {6,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};};
class Attachment_Sup556 {type = "trade_items";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};};
class Attachment_Sup68 {type = "trade_items";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};};
class Attachment_Sup57 {type = "trade_items";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};};
class Attachment_GP25 {type = "trade_items";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};};
class Attachment_M203 {type = "trade_items";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};};
};
@@ -131,6 +132,12 @@ class Category_14 {
class UMP_CCO_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {1,"ItemGoldBar10oz"};};
class UMP_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};};
class UMP_Holo_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {1,"ItemGoldBar10oz"};};
class P90_DZ {type = "trade_weapons";buy[] = {8,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};};
class P90_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {8,"ItemGoldBar"};};
class P90_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};};
class P90_CCO_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {1,"ItemGoldBar10oz"};};
class P90_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};};
class P90_Holo_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {1,"ItemGoldBar10oz"};};
};
//Single-shot/Shotguns

View File

@@ -162,6 +162,7 @@ class CfgWeapons
#include "Rifles\MP7.hpp"
#include "Rifles\TMP.hpp"
#include "Rifles\UMP.hpp"
#include "Rifles\P90.hpp"
class M16A2;
class M16A2GL;

View File

@@ -10,6 +10,8 @@ class Mac10_DZ: PDW_DZ
distanceZoomMax = 107;
modes[] = {"Single","FullAuto"};
class Attachments {};
class Single: Mode_SemiAuto
{
begin1[] = {"\RH_smg\sound\mac10.wss",1.778279,1,900};

View File

@@ -96,7 +96,8 @@ class Kriss_SD_DZ: MP5_SD_DZ
descriptionShort = $STR_DZ_WPN_KRISS_SD_DESC;
model = "\RH_smg\RH_krisssd.p3d";
picture = "\RH_smg\inv\krisssd.paa";
handAnim[] = {"OFP2_ManSkeleton","\RH_smg\Anim\NORRN_RH_Kris.rtm"};
handAnim[] = {"OFP2_ManSkeleton","\RH_smg\Anim\NORRN_RH_Kris1.rtm"};
reloadMagazineSound[] = {"\RH_smg\Sound\kriss_reload.wss",0.056234,1,25};
magazines[] = {"33Rnd_45ACP_KRISSSD"};
fireLightDuration = 0.0;
fireLightIntensity = 0.0;

View File

@@ -0,0 +1,185 @@
class P90_DZ: MP5_DZ
{
displayName = $STR_DZ_WPN_P90_NAME;
descriptionShort = $STR_DZ_WPN_P90_DESC;
model = "\RH_smg\RH_p90.p3d";
picture = "\RH_smg\inv\p90.paa";
magazines[] = {"50Rnd_57x28_P90"};
handAnim[] = {"OFP2_ManSkeleton","\RH_smg\Anim\NORRN_RH_p90.rtm"};
reloadMagazineSound[] = {"\RH_smg\sound\p90_Reload.wss",0.056234,1,25};
modes[] = {"Single","FullAuto"};
class Single: Mode_SemiAuto
{
begin1[] = {"\RH_smg\sound\p90s.wss",1.778279,1,900};
soundBegin[] = {"begin1",1};
};
delete Burst;
class FullAuto: Mode_FullAuto
{
begin1[] = {"\RH_smg\sound\p90s.wss",1.778279,1,900};
soundBegin[] = {"begin1",1};
};
class FlashLight
{
color[] = {0.9,0.9,0.7,0.9};
ambient[] = {0.1,0.1,0.1,1.0};
position = "flash dir";
direction = "flash";
angle = 30;
scale[] = {1,1,0.5};
brightness = 0.1;
};
class Attachments
{
Attachment_CCO = "P90_CCO_DZ";
Attachment_Holo = "P90_Holo_DZ";
Attachment_Sup57 = "P90_SD_DZ";
};
};
class P90_CCO_DZ: P90_DZ
{
displayname = $STR_DZ_WPN_P90_CCO_NAME;
model = "\RH_smg\RH_p90aim.p3d";
picture = "\RH_smg\inv\p90aim.paa";
class Attachments
{
Attachment_Sup57 = "P90_CCO_SD_DZ";
};
class ItemActions
{
class RemoveCCO
{
text = $STR_DZ_ATT_CCO_RMVE;
script = "; ['Attachment_CCO',_id,'P90_DZ'] call player_removeAttachment";
};
};
};
class P90_Holo_DZ: P90_DZ
{
displayname = $STR_DZ_WPN_P90_HOLO_NAME;
model = "\RH_smg\RH_p90eot.p3d";
picture = "\RH_smg\inv\p90eot.paa";
class Attachments
{
Attachment_Sup57 = "P90_Holo_SD_DZ";
};
class ItemActions
{
class RemoveHolo
{
text = $STR_DZ_ATT_HOLO_RMVE;
script = "; ['Attachment_Holo',_id,'P90_DZ'] call player_removeAttachment";
};
};
};
class P90_SD_DZ: MP5_SD_DZ
{
displayName = $STR_DZ_WPN_P90_SD_NAME;
descriptionShort = $STR_DZ_WPN_P90_SD_DESC;
model = "\RH_smg\RH_P90sd.p3d";
picture = "\RH_smg\inv\P90sd.paa";
handAnim[] = {"OFP2_ManSkeleton","\RH_smg\Anim\NORRN_RH_p90.rtm"};
reloadMagazineSound[] = {"\RH_smg\sound\p90_Reload.wss",0.056234,1,25};
magazines[] = {"50Rnd_57x28_P90SD"};
fireLightDuration = 0.0;
fireLightIntensity = 0.0;
modes[] = {"Single","FullAuto"};
class Single: Mode_SemiAuto
{
begin1[] = {"\RH_smg\sound\p90sds.wss",1.778279,1,50};
soundBegin[] = {"begin1",1};
};
delete Burst;
class FullAuto: Mode_FullAuto
{
begin1[] = {"\RH_smg\sound\p90sds.wss",1.778279,1,50};
soundBegin[] = {"begin1",1};
};
class FlashLight
{
color[] = {0.9,0.9,0.7,0.9};
ambient[] = {0.1,0.1,0.1,1.0};
position = "flash dir";
direction = "flash";
angle = 30;
scale[] = {1,1,0.5};
brightness = 0.1;
};
class Attachments
{
Attachment_CCO = "P90_CCO_SD_DZ";
Attachment_Holo = "P90_Holo_SD_DZ";
};
class ItemActions
{
class RemoveSuppressor
{
text = $STR_ATTACHMENT_RMVE_Silencer;
script = "; ['Attachment_Sup57',_id,'P90_DZ'] call player_removeAttachment";
};
};
};
class P90_CCO_SD_DZ: P90_SD_DZ
{
displayname = $STR_DZ_WPN_P90_CCO_SD_NAME;
model = "\RH_smg\RH_p90sdaim.p3d";
picture = "\RH_smg\inv\p90sdaim.paa";
class Attachments {};
class ItemActions
{
class RemoveCCO
{
text = $STR_DZ_ATT_CCO_RMVE;
script = "; ['Attachment_CCO',_id,'P90_SD_DZ'] call player_removeAttachment";
};
class RemoveSuppressor
{
text = $STR_ATTACHMENT_RMVE_Silencer;
script = "; ['Attachment_Sup57',_id,'P90_CCO_DZ'] call player_removeAttachment";
};
};
};
class P90_Holo_SD_DZ: P90_SD_DZ
{
displayname = $STR_DZ_WPN_P90_HOLO_SD_NAME;
model = "\RH_smg\RH_p90sdeot.p3d";
picture = "\RH_smg\inv\p90sdeot.paa";
class Attachments {};
class ItemActions
{
class RemoveHolo
{
text = $STR_DZ_ATT_HOLO_RMVE;
script = "; ['Attachment_Holo',_id,'P90_SD_DZ'] call player_removeAttachment";
};
class RemoveSuppressor
{
text = $STR_ATTACHMENT_RMVE_Silencer;
script = "; ['Attachment_Sup57',_id,'P90_Holo_DZ'] call player_removeAttachment";
};
};
};

View File

@@ -577,6 +577,38 @@ class CfgAmmo
visiblefire = 10;
};
//P90
class B_57x28_Ball: BulletBase
{
airfriction = -0.0013522;
audibleFire = 16;
visiblefire = 16;
caliber = 0.33;
cartridge = "FxCartridge_9mm";
cost = 5;
hit = 8;
indirecthit = 0;
indirecthitrange = 0;
typicalspeed = 400;
};
//P90 SD
class B_57x28_SD: BulletBase
{
airfriction = -0.0013522;
visibleFire = 0.08;
audibleFire = 0.08;
caliber = 0.33; //33
cartridge = "FxCartridge_9mm";
cost = 5;
hit = 8;
indirecthit = 0;
indirecthitrange = 0;
typicalspeed = 300;
};
//mosin nagant
/*class Mosin_762 : BulletBase
{

View File

@@ -12446,7 +12446,49 @@
<Russian>Пистолет-пулемет с ПБС &lt;br/&gt;Патрон: .45 ACP SD</Russian>
<Polish>Pistolet maszynowy z tłumikiem &lt;br/&gt;Kaliber: .45 ACP SD </Polish>
<Hungarian>Hangtompítós géppisztoly &lt;br/&gt; Kaliber: .45 ACP SD</Hungarian>
</Key>
<!-- P90 -->
<Key ID="STR_DZ_WPN_P90_NAME">
<English>P90</English>
</Key>
<Key ID="STR_DZ_WPN_P90_CCO_NAME">
<English>P90 CCO</English>
</Key>
<Key ID="STR_DZ_WPN_P90_HOLO_NAME">
<English>P90 Holo</English>
</Key>
<Key ID="STR_DZ_WPN_P90_SD_NAME">
<English>P90 SD</English>
</Key>
<Key ID="STR_DZ_WPN_P90_CCO_SD_NAME">
<English>P90 CCO SD</English>
</Key>
<Key ID="STR_DZ_WPN_P90_HOLO_SD_NAME">
<English>P90 Holo SD</English>
</Key>
<Key ID="STR_DZ_WPN_P90_DESC">
<German>Maschinenpistole &lt;br/&gt;Kaliber: 5.7x28mm</German>
<English>Submachine gun &lt;br/&gt;Caliber: 5.7x28mm</English>
<Italian>Fucile mitragliatore &lt;br/&gt;Calibro: 5.7x28mm</Italian>
<Spanish>Metralleta &lt;br/&gt;Calibre: 5.7x28mm</Spanish>
<French>Pistolet-mitrailleur &lt;br/&gt;Calibre: 5.7x28mm</French>
<Czech>Samopal &lt;br/&gt;Kalibr: 5.7x28mm</Czech>
<Russian>Пистолет-пулемет &lt;br/&gt;Патрон: 5.7x28mm</Russian>
<Polish>Pistolet maszynowy &lt;br/&gt;Kaliber: 5.7x28mm</Polish>
<Hungarian>Géppisztoly &lt;br/&gt; Kaliber: 5.7x28mm</Hungarian>
</Key>
<Key ID="STR_DZ_WPN_P90_SD_DESC">
<English>Silenced submachine gun &lt;br/&gt;Caliber: 5.7x28mm SD</English>
<German>Schallgedämpfte Maschinenpistole &lt;br/&gt;Kaliber: 5.7x28mm SD</German>
<Italian>Fucile mitragliatore con silenziatore &lt;br/&gt;Calibro: 5.7x28mm SD</Italian>
<Spanish>Metralleta con silenciador &lt;br/&gt;Calibre: 5.7x28mm SD</Spanish>
<French>Pistolet-mitrailleur à silencieux &lt;br/&gt;Calibre: 5.7x28mm SD</French>
<Czech>Samopal s tlumičem &lt;br/&gt;Kalibr: 5.7x28mm SD</Czech>
<Russian>Пистолет-пулемет с ПБС &lt;br/&gt;Патрон: 5.7x28mm SD</Russian>
<Polish>Pistolet maszynowy z tłumikiem &lt;br/&gt;Kaliber: 5.7x28mm SD </Polish>
<Hungarian>Hangtompítós géppisztoly &lt;br/&gt; Kaliber: 5.7x28mm SD</Hungarian>
</Key>
<!-- **** MAGAZINES **** -->
@@ -13506,6 +13548,37 @@
<Polish>Kaliber: .45 ACP SD&lt;br/&gt;Naboje: 25 &lt;br/&gt;Używane w: UMP SD</Polish>
<Hungarian>Kaliber: .45 ACP SD&lt;br/&gt; Töltények: 25 &lt;br/&gt; Hozzá tartozó fegyver: UMP SD</Hungarian>
</Key>
<Key ID="STR_DZ_MAG_50RND_P90_NAME">
<English>50Rnd. P90 mag.</English>
<Russian>50п. P90 маг.</Russian>
</Key>
<Key ID="STR_DZ_MAG_50RND_P90SD_NAME">
<English>50Rnd. P90 SD mag.</English>
<Russian>50п. P90 глуш. маг.</Russian>
</Key>
<Key ID="STR_DZ_MAG_50RND_P90_DESC">
<German>Kaliber: 5.7x28mm &lt;br/&gt;Patronen: 50 &lt;br/&gt;Eingesetzt in: P90</German>
<English>Caliber: 5.7x28mm &lt;br/&gt;Rounds: 50 &lt;br/&gt;Used in: P90</English>
<Italian>Calibro: 5.7x28mm &lt;br/&gt;Munizioni: 50 &lt;br/&gt;Si usa in: P90</Italian>
<Spanish>Calibre: 5.7x28mm &lt;br/&gt;Cargas: 50 &lt;br/&gt;Uso: P90 </Spanish>
<French>Calibre: 5.7x28mm &lt;br/&gt;Munitions: 50 &lt;br/&gt;Utilisé avec: P90</French>
<Czech>Kalibr: 5.7x28mm &lt;br/&gt;Nábojů: 50 &lt;br/&gt;Pro: P90</Czech>
<Russian>Патрон: 5.7x28mm &lt;br/&gt;Количество: 50 &lt;br/&gt;Используется в: P90</Russian>
<Polish>Kaliber: 5.7x28mm &lt;br/&gt;Naboje: 50 &lt;br/&gt;Używane w: P90</Polish>
<Hungarian>Kaliber: 5.7x28mm &lt;br/&gt; Töltények: 50 &lt;br/&gt; Hozzá tartozó fegyver: P90</Hungarian>
</Key>
<Key ID="STR_DZ_MAG_50RND_P90SD_DESC">
<German>Kaliber: 5.7x28mm SD&lt;br/&gt;Patronen: 50 &lt;br/&gt;Eingesetzt in: P90 SD</German>
<English>Caliber: 5.7x28mm SD&lt;br/&gt;Rounds: 50 &lt;br/&gt;Used in: P90 SD</English>
<Italian>Calibro: 5.7x28mm SD&lt;br/&gt;Munizioni: 50 &lt;br/&gt;Si usa in: P90 SD</Italian>
<Spanish>Calibre: 5.7x28mm SD&lt;br/&gt;Cargas: 50 &lt;br/&gt;Uso: P90 SD</Spanish>
<French>Calibre: 5.7x28mm SD&lt;br/&gt;Munitions: 50 &lt;br/&gt;Utilisé avec: P90 SD</French>
<Czech>Kalibr: 5.7x28mm SD&lt;br/&gt;Nábojů: 50 &lt;br/&gt;Pro: P90 SD</Czech>
<Russian>Патрон: 5.7x28mm SD&lt;br/&gt;Количество: 50 &lt;br/&gt;Используется в: P90 SD</Russian>
<Polish>Kaliber: 5.7x28mm SD&lt;br/&gt;Naboje: 50 &lt;br/&gt;Używane w: P90 SD</Polish>
<Hungarian>Kaliber: 5.7x28mm SD&lt;br/&gt; Töltények: 50 &lt;br/&gt; Hozzá tartozó fegyver: P90 SD</Hungarian>
</Key>
<!-- **** ATTACHMENTS **** -->
@@ -13567,7 +13640,18 @@
<English>10mm Sound suppressor</English>
<Russian>ПБС для калибра 10мм</Russian>
<German>10mm Schalldämpfer</German>
</Key>
</Key>
<!-- 5.7mm Suppressor ACR-->
<Key ID="STR_DZ_ATT_SUP57_NAME">
<English>[A] 5.7mm Suppressor</English>
<Russian>[М] 5.7vмм глушитель</Russian>
<German>[E] 5.7mm Schalldämpfer</German>
</Key>
<Key ID="STR_DZ_ATT_SUP57_DESC">
<English>5.7mm Sound suppressor</English>
<Russian>ПБС для калибра 5.7мм</Russian>
<German>5.7mm Schalldämpfer</German>
</Key>
<!-- 6.8mm Suppressor ACR-->
<Key ID="STR_DZ_ATT_SUP68_NAME">
<English>[A] 6.80mm Suppressor</English>