diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 182c7967d..58ea30cd7 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -77,6 +77,8 @@ weaponsUS[] = {Loot_WEAPON, 3, Mac10_DZ}, // Assault Rifles + {Loot_WEAPON, 6, Masada_DZ}, + {Loot_WEAPON, 6, Masada_BL_DZ}, {Loot_WEAPON, 6, CTAR21_DZ}, {Loot_WEAPON, 6, KAC_PDW_DZ}, {Loot_WEAPON, 6, M16A2_DZ}, diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp index e41fa778c..e6af89fd6 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp @@ -25,16 +25,21 @@ class 100Rnd_556x45_M249 : 200Rnd_556x45_M249 class 100Rnd_556x45_BetaCMag: CA_Magazine { scope = public; - displayName = $STR_DZ_MAG_100RND_556x45_MG36_NAME; + displayName = $STR_DZ_MAG_100RND_556x45_BetaCMag_NAME; ammo = "B_556x45_Ball"; count = 100; initSpeed = 920; model = "dayz_epoch_c\models\magazines\MG36_mag.p3d"; picture = "\ca\weapons\g36\data\equip\M_MG36_CA.paa"; - type="256"; + type = WeaponSlotItem; tracersEvery = 4; lastRoundsTracer = 4; - descriptionShort = $STR_DZ_MAG_100RND_MG36_DESC; + descriptionShort = $STR_DZ_MAG_100RND_BetaCMag_DESC; + + class ItemActions + { + COMBINE_MAG + }; }; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp index 586f450e6..9658a2eeb 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp @@ -196,6 +196,22 @@ class Category_16 { class HK53A3_DZ {type = "trade_weapons";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};}; class HK53A3_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; class HK53A3_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; + class Masada_DZ {type = "trade_weapons";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};}; + class Masada_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; + class Masada_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; + class Masada_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};}; + class Masada_CCO_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {8,"ItemGoldBar"};}; + class Masada_Holo_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {8,"ItemGoldBar"};}; + class Masada_ACOG_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};}; + class Masada_ACOG_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {1,"ItemGoldBar10oz"};}; + class Masada_BL_DZ {type = "trade_weapons";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};}; + class Masada_BL_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; + class Masada_BL_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; + class Masada_BL_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};}; + class Masada_BL_CCO_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {8,"ItemGoldBar"};}; + class Masada_BL_Holo_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {8,"ItemGoldBar"};}; + class Masada_BL_ACOG_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {6,"ItemGoldBar"};}; + class Masada_BL_ACOG_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {1,"ItemGoldBar10oz"};}; class PDR_DZ {type = "trade_weapons";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};}; class PDR_CCO_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; class PDR_Holo_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index 37cfa4e9d..7171a36b9 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -91,6 +91,7 @@ class CfgWeapons #include "Rifles\KACPDW.hpp" //CTAR-21 #include "Rifles\CTAR21.hpp" + #include "Rifles\Masada.hpp" class M14_EP1; #include "Rifles\M14.hpp" diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/Masada.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Masada.hpp new file mode 100644 index 000000000..668556e4c --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/Masada.hpp @@ -0,0 +1,438 @@ +#define MasadaC_ACOG modelOptics = "\Ca\weapons_E\SCAR\ACOG_TA31_optic_4x.p3d";\ +class OpticsModes\ +{\ + class ACOG\ + {\ + opticsID = 1;\ + useModelOptics = true;\ + opticsFlare = true;\ + opticsDisablePeripherialVision = true;\ + opticsZoomMin = 0.0623;\ + opticsZoomMax = 0.0623;\ + opticsZoomInit = 0.0623;\ + distanceZoomMin = 300;\ + distanceZoomMax = 300;\ + memoryPointCamera = "opticView";\ + visionMode[] = {"Normal"};\ + opticsPPEffects[] = {"OpticsCHAbera3","OpticsBlur3"};\ + cameraDir = "";\ + };\ + \ + class Iron\ + {\ + opticsID = 2;\ + useModelOptics = false;\ + opticsFlare = false;\ + opticsDisablePeripherialVision = false;\ + opticsZoomMin = 0.25;\ + opticsZoomMax = 1.1;\ + opticsZoomInit = 0.5;\ + distanceZoomMin = 100;\ + distanceZoomMax = 100;\ + memoryPointCamera = "eye";\ + visionMode[] = {};\ + opticsPPEffects[] = {};\ + cameraDir = "";\ + };\ +} + +class Masada_DZ : M4A1 +{ + displayName = $STR_DZ_WPN_Masada_NAME; + model = "\RH_hk416\RH_mas.p3d"; + picture = "\RH_hk416\inv\mas.paa"; + handAnim[] = {"OFP2_ManSkeleton"}; + reloadMagazineSound[] = {"\RH_hk416\sound\ctar21_Reload.wss",0.056234,1,20}; + modes[] = {"Single","FullAuto"}; + class Single: Mode_SemiAuto + { + begin1[] = {"\RH_hk416\sound\acr.wss",1.778279,1,1000}; + soundBegin[] = {"begin1",1}; + }; + class FullAuto: Mode_FullAuto + { + begin1[] = {"\RH_hk416\sound\acr.wss",1.778279,1,1000}; + soundBegin[] = {"begin1",1}; + }; + + magazines[] = + { + 30Rnd_556x45_Stanag, + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; + + class Attachments + { + Attachment_CCO = "Masada_CCO_DZ"; + Attachment_Holo = "Masada_Holo_DZ"; + Attachment_ACOG = "Masada_ACOG_DZ"; + Attachment_Sup556 = "Masada_SD_DZ"; + }; +}; + +class Masada_SD_DZ : M4A1_AIM_SD_camo +{ + model = "\RH_hk416\RH_massd.p3d"; + picture = "\RH_hk416\inv\massd.paa"; + displayName = $STR_DZ_WPN_Masada_SD_NAME; + + handAnim[] = {"OFP2_ManSkeleton"}; + reloadMagazineSound[] = {"\RH_hk416\sound\Hk416_Reload.wss",0.056234,1,20}; + + modes[] = {"Single","FullAuto"}; + class Single: Mode_SemiAuto + { + begin1[] = {"\RH_hk416\sound\massd.wss",1.0,1,50}; + soundBegin[] = {"begin1",1}; + }; + class FullAuto: Mode_FullAuto + { + begin1[] = {"\RH_hk416\sound\massd.wss",1.0,1,50}; + soundBegin[] = {"begin1",1}; + }; + + magazines[] = + { + 30Rnd_556x45_StanagSD, + 30Rnd_556x45_G36SD + }; + + class Attachments + { + Attachment_CCO = "Masada_CCO_SD_DZ"; + Attachment_Holo = "Masada_Holo_SD_DZ"; + Attachment_ACOG = "Masada_ACOG_SD_DZ"; + }; + + class ItemActions + { + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup556',_id,'Masada_DZ'] call player_removeAttachment"; + }; + }; +}; + +//CCO +class Masada_CCO_DZ : Masada_DZ +{ + model = "\RH_hk416\RH_masaim.p3d"; + picture = "\RH_hk416\inv\masaim.paa"; + displayName = $STR_DZ_WPN_Masada_CCO_NAME; + + class Attachments + { + Attachment_Sup556 = "Masada_CCO_SD_DZ"; + }; + + class ItemActions + { + class RemoveCCO + { + text = $STR_DZ_ATT_CCO_RMVE; + script = "; ['Attachment_CCO',_id,'Masada_DZ'] call player_removeAttachment"; + }; + }; +}; + +class Masada_CCO_SD_DZ : Masada_SD_DZ +{ + model = "\RH_hk416\RH_massdaim.p3d"; + picture = "\RH_hk416\inv\massdaim.paa"; + displayName = $STR_DZ_WPN_Masada_CCO_SD_NAME; + + class Attachments {}; + + class ItemActions + { + class RemoveCCO + { + text = $STR_DZ_ATT_CCO_RMVE; + script = "; ['Attachment_CCO',_id,'Masada_SD_DZ'] call player_removeAttachment"; + }; + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup556',_id,'Masada_CCO_DZ'] call player_removeAttachment"; + }; + }; +}; + + +//Holo + +class Masada_Holo_DZ : Masada_DZ +{ + model = "\RH_hk416\RH_maseotech.p3d"; + picture = "\RH_hk416\inv\maseotech.paa"; + displayName = $STR_DZ_WPN_Masada_HOLO_NAME; + + class Attachments + { + Attachment_Sup556 = "Masada_Holo_SD_DZ"; + }; + + class ItemActions + { + class RemoveHolo + { + text = $STR_DZ_ATT_HOLO_RMVE; + script = "; ['Attachment_Holo',_id,'Masada_DZ'] call player_removeAttachment"; + }; + }; +}; + +class Masada_Holo_SD_DZ : Masada_SD_DZ +{ + model = "\RH_hk416\RH_massdeotech.p3d"; + picture = "\RH_hk416\inv\massdeotech.paa"; + displayName = $STR_DZ_WPN_Masada_HOLO_SD_NAME; + + class Attachments {}; + + class ItemActions + { + class RemoveHolo + { + text = $STR_DZ_ATT_HOLO_RMVE; + script = "; ['Attachment_Holo',_id,'Masada_SD_DZ'] call player_removeAttachment"; + }; + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup556',_id,'Masada_Holo_DZ'] call player_removeAttachment"; + }; + }; +}; + +class Masada_ACOG_DZ : Masada_DZ +{ + model = "\RH_hk416\RH_masacog.p3d"; + picture = "\RH_hk416\inv\masacog.paa"; + displayName = $STR_DZ_WPN_Masada_ACOG_NAME; + + MasadaC_ACOG; + + class Attachments + { + Attachment_Sup556 = "Masada_ACOG_SD_DZ"; + }; + + class ItemActions + { + class RemoveACOG + { + text = $STR_DZ_ATT_ACOG_RMVE; + script = "; ['Attachment_ACOG',_id,'Masada_DZ'] call player_removeAttachment"; + }; + }; +}; + +class Masada_ACOG_SD_DZ : Masada_SD_DZ +{ + model = "\RH_hk416\RH_massdacog.p3d"; + picture = "\RH_hk416\inv\massdacog.paa"; + displayName = $STR_DZ_WPN_Masada_ACOG_SD_NAME; + + MasadaC_ACOG; + + class Attachments {}; + + class ItemActions + { + class RemoveACOG + { + text = $STR_DZ_ATT_ACOG_RMVE; + script = "; ['Attachment_ACOG',_id,'Masada_SD_DZ'] call player_removeAttachment"; + }; + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup556',_id,'Masada_ACOG_DZ'] call player_removeAttachment"; + }; + }; +}; + +class Masada_BL_DZ : Masada_DZ +{ + displayName = $STR_DZ_WPN_Masada_NAME; + model = "\RH_hk416\RH_masb.p3d"; + picture = "\RH_hk416\inv\masb.paa"; + + class Attachments + { + Attachment_CCO = "Masada_BL_CCO_DZ"; + Attachment_Holo = "Masada_BL_Holo_DZ"; + Attachment_ACOG = "Masada_BL_ACOG_DZ"; + Attachment_Sup556 = "Masada_BL_SD_DZ"; + }; +}; + +class Masada_BL_SD_DZ : Masada_SD_DZ +{ + model = "\RH_hk416\RH_masbsd.p3d"; + picture = "\RH_hk416\inv\masbsd.paa"; + displayName = $STR_DZ_WPN_Masada_SD_NAME; + + class Attachments + { + Attachment_CCO = "Masada_BL_CCO_SD_DZ"; + Attachment_Holo = "Masada_BL_Holo_SD_DZ"; + Attachment_ACOG = "Masada_BL_ACOG_SD_DZ"; + }; + + class ItemActions + { + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup556',_id,'Masada_BL_DZ'] call player_removeAttachment"; + }; + }; +}; + +//CCO +class Masada_BL_CCO_DZ : Masada_BL_DZ +{ + model = "\RH_hk416\RH_masbaim.p3d"; + picture = "\RH_hk416\inv\masbaim.paa"; + displayName = $STR_DZ_WPN_Masada_CCO_NAME; + + class Attachments + { + Attachment_Sup556 = "Masada_BL_CCO_SD_DZ"; + }; + + class ItemActions + { + class RemoveCCO + { + text = $STR_DZ_ATT_CCO_RMVE; + script = "; ['Attachment_CCO',_id,'Masada_BL_DZ'] call player_removeAttachment"; + }; + }; +}; + +class Masada_BL_CCO_SD_DZ : Masada_BL_SD_DZ +{ + model = "\RH_hk416\RH_masbsdaim.p3d"; + picture = "\RH_hk416\inv\masbsdaim.paa"; + displayName = $STR_DZ_WPN_Masada_CCO_SD_NAME; + + class Attachments {}; + + class ItemActions + { + class RemoveCCO + { + text = $STR_DZ_ATT_CCO_RMVE; + script = "; ['Attachment_CCO',_id,'Masada_BL_SD_DZ'] call player_removeAttachment"; + }; + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup556',_id,'Masada_BL_CCO_DZ'] call player_removeAttachment"; + }; + }; +}; + + +//Holo + +class Masada_BL_Holo_DZ : Masada_BL_DZ +{ + model = "\RH_hk416\RH_masbeotech.p3d"; + picture = "\RH_hk416\inv\masbeotech.paa"; + displayName = $STR_DZ_WPN_Masada_HOLO_NAME; + + class Attachments + { + Attachment_Sup556 = "Masada_BL_Holo_SD_DZ"; + }; + + class ItemActions + { + class RemoveHolo + { + text = $STR_DZ_ATT_HOLO_RMVE; + script = "; ['Attachment_Holo',_id,'Masada_BL_DZ'] call player_removeAttachment"; + }; + }; +}; + +class Masada_BL_Holo_SD_DZ : Masada_BL_SD_DZ +{ + model = "\RH_hk416\RH_masbsdeotech.p3d"; + picture = "\RH_hk416\inv\masbsdeotech.paa"; + displayName = $STR_DZ_WPN_Masada_HOLO_SD_NAME; + + class Attachments {}; + + class ItemActions + { + class RemoveHolo + { + text = $STR_DZ_ATT_HOLO_RMVE; + script = "; ['Attachment_Holo',_id,'Masada_BL_SD_DZ'] call player_removeAttachment"; + }; + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup556',_id,'Masada_BL_Holo_DZ'] call player_removeAttachment"; + }; + }; +}; + +class Masada_BL_ACOG_DZ : Masada_BL_DZ +{ + model = "\RH_hk416\RH_masbacog.p3d"; + picture = "\RH_hk416\inv\masbacog.paa"; + displayName = $STR_DZ_WPN_Masada_ACOG_NAME; + + MasadaC_ACOG; + + class Attachments + { + Attachment_Sup556 = "Masada_BL_ACOG_SD_DZ"; + }; + + class ItemActions + { + class RemoveACOG + { + text = $STR_DZ_ATT_ACOG_RMVE; + script = "; ['Attachment_ACOG',_id,'Masada_BL_DZ'] call player_removeAttachment"; + }; + }; +}; + +class Masada_BL_ACOG_SD_DZ : Masada_BL_SD_DZ +{ + model = "\RH_hk416\RH_masbsdacog.p3d"; + picture = "\RH_hk416\inv\masbsdacog.paa"; + displayName = $STR_DZ_WPN_Masada_ACOG_SD_NAME; + + MasadaC_ACOG; + + class Attachments {}; + + class ItemActions + { + class RemoveACOG + { + text = $STR_DZ_ATT_ACOG_RMVE; + script = "; ['Attachment_ACOG',_id,'Masada_BL_SD_DZ'] call player_removeAttachment"; + }; + class RemoveSuppressor + { + text = $STR_ATTACHMENT_RMVE_Silencer; + script = "; ['Attachment_Sup556',_id,'Masada_BL_ACOG_DZ'] call player_removeAttachment"; + }; + }; +}; + +#undef MasadaC_ACOG \ No newline at end of file diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index df76bdd4e..210786a89 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -12566,13 +12566,6 @@ HK417 SD HK417 ПБС - - HK417 M203 - - - HK417 M203 SD - HK417 M203 ПБС - HK417 CCO @@ -12580,13 +12573,6 @@ HK417 CCO SD HK417 CCO ПБС - - HK417 M203 CCO - - - HK417 M203 CCO SD - HK417 M203 CCO ПБС - HK417 Holo @@ -12594,13 +12580,6 @@ HK417 Holo SD HK417 Holo ПБС - - HK417 M203 Holo - - - HK417 M203 Holo SD - HK417 M203 Holo ПБС - HK417 ACOG @@ -12651,6 +12630,36 @@ CTAR-21 ACOG + + + Masada + + + Masada SD + Masada ПБС + + + Masada CCO + + + Masada CCO SD + Masada CCO ПБС + + + Masada Holo + + + Masada Holo SD + Masada Holo ПБС + + + Masada ACOG + + + Masada ACOG SD + Masada ACOG ПБС + + @@ -12991,12 +13000,10 @@ Kaliber: 5,45x39mm <br/>Naboje: 75 <br/>Używane w: AK-74, AK-74 Kobra, AKS-74U, AK-107 i RPK-74 Kaliber: 5.45x39mm <br/> Töltények: 75 <br/> Hozzá tartozó fegyver: AK-74, AK-74 Kobra, AKS-74U, AK-107 and RPK-74 - - 100Rnd. MG36 drum mag. - 100 Schuss MG36 Trommelmagazin - 100п. МГ-36 барабан + + 100Rnd. Beta C-Mag - + Kaliber: 5.56x45mm <br/>Patronen: 100 <br/>Eingesetzt in: G36, MG36, M16, M4, M249, MK-12, M8 und L110 Caliber: 5.56x45mm <br/>Rounds: 100 <br/>Used in: G36, MG36, M16, M4, M249, MK-12, M8 and L110 Calibro: 5.56x45mm <br/>Munizioni: 100 <br/>Si usa in: G36, MG36, M16, M4, M249, MK-12, M8 e L110