From 82485ea0c6db3eaca3560d4d40e188508e19b1b0 Mon Sep 17 00:00:00 2001 From: A Man Date: Wed, 23 Oct 2019 09:25:20 +0200 Subject: [PATCH] Adding AK-107 to attachment system, loot, trader This adds 6 AK-107 versions to the dayz attachment system. There is no SD version at the moment. The RPK-74 magazine could only be used with the AK-74 SD. This was unintentional. All AK-74 versions support the RPK-74 magazine now. The RPK-74 and the AK-74 magazine description needed a few adjustments. --- CHANGE LOG 1.0.6.3.txt | 2 + .../Configs/CfgLoot/Groups/Weapons.hpp | 1 + .../Category/FriendlyAssaultRifle.hpp | 30 ++++ .../Configs/CfgWeapons/CfgWeapons.hpp | 2 + .../Configs/CfgWeapons/Rifles/AK74.hpp | 7 +- .../Configs/CfgWeapons/Rifles/AKS74U.hpp | 6 +- .../CfgWeapons/Weapon/Assault/AK107.hpp | 157 ++++++++++++++++++ .../R3F_Realism/R3F_Weight/Weapons/Rifles.hpp | 24 +++ SQF/dayz_code/stringtable.xml | 55 +++++- 9 files changed, 278 insertions(+), 6 deletions(-) create mode 100644 SQF/dayz_code/Configs/CfgWeapons/Weapon/Assault/AK107.hpp diff --git a/CHANGE LOG 1.0.6.3.txt b/CHANGE LOG 1.0.6.3.txt index 051da16b6..b1def13e8 100644 --- a/CHANGE LOG 1.0.6.3.txt +++ b/CHANGE LOG 1.0.6.3.txt @@ -2,6 +2,7 @@ [NEW] Added 93 new zombie models with loot groups and strings for Server Admins @Airwavesman [NEW] Zombie Loot supports backpacks now @Airwavesman [NEW] Hide Body can be edited and toggled now. Enabled by default, configVariables.sqf/DZE_Hide_Body @AirwavesMan +[NEW] 6 AK-107 versions added with attachment support. @AirwavesMan [FIXED] Some more occurrences of zero_building interiors misaligned or at the wrong terrain height (eaaedf2, 048caa5) [FIXED] Player could switch into gunner's seat of ArmoredSUV while the hatch was being closed (e89eebc) #2009 @TheFirstNoob @@ -18,6 +19,7 @@ [FIXED] Vehicles jumping into the air after flipping. @AirwavesMan [FIXED] Crafting wooden arrows from wood piles and razors was not possible. @AirwavesMan [FIXED] Top snap point for half cinder wall was incorrect. @ndavalos, @AirwavesMan +[FIXED] The RPK-74 magazine could not be used with all AK-74 versions. @AirwavesMan [UPDATED] Spawning of Zombies and Loot in Safe Zones can now be toggled, disabled by default, see configVariables.sqf/DZE_SafeZoneZombieLoot (6248add, 141b25e) @oiad @_Lance_ [UPDATED] Added notification when status icons are disabled diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 872c3fb17..d34215562 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -74,6 +74,7 @@ assaultrifles[] = { {Loot_WEAPON, 0.1, AKS_GOLD}, {Loot_WEAPON, 0.5, AKM_DZ}, //AK_47_M {Loot_WEAPON, 0.5, AK74_DZ}, //AK_74 + {Loot_WEAPON, 0.5, AK107_DZ}, //AK_107 {Loot_WEAPON, 0.3, FNFAL_DZ}, //FN_FAL {Loot_WEAPON, 0.1, FN_FAL_ANPVS4_DZE}, //FNFAL_ANPVS4_DZ is NV only _DZE is toggleable {Loot_WEAPON, 0.5, G36A_Camo_DZ}, //G36A_camo diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp index 71756661a..5fab69e42 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp @@ -769,6 +769,36 @@ class Category_485 { buy[] = {-1,"ItemGoldBar"}; // Sell only sell[] = {1,"ItemGoldBar10oz"}; }; + class AK107_DZ { + type = "trade_weapons"; + buy[] = {2,"ItemGoldBar"}; + sell[] = {1,"ItemGoldBar"}; + }; + class AK107_Kobra_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; // Sell only + sell[] = {3,"ItemGoldBar"}; + }; + class AK107_PSO1_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; // Sell only + sell[] = {5,"ItemGoldBar"}; + }; + class AK107_GL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; // Sell only + sell[] = {3,"ItemGoldBar"}; + }; + class AK107_GL_Kobra_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; // Sell only + sell[] = {5,"ItemGoldBar"}; + }; + class AK107_GL_PSO1_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; // Sell only + sell[] = {7,"ItemGoldBar"}; + }; class FNFAL_DZ { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index c10c7af8e..587773450 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -29,6 +29,8 @@ class CfgWeapons #include "Weapon\Sniper\M4SPR.hpp" #include "Weapon\Sniper\VSSVintorez.hpp" + //Ak107 + #include "Weapon\Assault\AK107.hpp" //each include is preceded by its required external references. diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp index 196a01ab5..243907c02 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AK74.hpp @@ -5,13 +5,14 @@ class AK74_Kobra_DZ : AK_74 model = "z\addons\dayz_communityweapons\ak74\ak74_kobra.p3d"; picture = "\z\addons\dayz_communityweapons\ak74\data\w_ak74_kobra_ca.paa"; displayName = $STR_DZ_WPN_AK74_KOBRA_NAME; - /* //Allow default A2 mags + magazines[] = { 30Rnd_545x39_AK, - 30Rnd_545x39_AKSD + 30Rnd_545x39_AKSD, //Allow both SD and non-SD + 75Rnd_545x39_RPK }; - */ + class Attachments { Attachment_GP25 = "AK74_GL_Kobra_DZ"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp index a38b59f82..a2ca5804b 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AKS74U.hpp @@ -7,7 +7,8 @@ class AKS74U_Kobra_DZ : AKS_74_U magazines[] = { 30Rnd_545x39_AK, - 30Rnd_545x39_AKSD + 30Rnd_545x39_AKSD, //Allow both SD and non-SD + 75Rnd_545x39_RPK }; class Attachments @@ -34,7 +35,8 @@ class AKS74U_Kobra_SD_DZ : AKS_74_UN_kobra magazines[] = { 30Rnd_545x39_AKSD, - 30Rnd_545x39_AK //Allow both SD and non-SD + 30Rnd_545x39_AK, //Allow both SD and non-SD + 75Rnd_545x39_RPK }; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgWeapons/Weapon/Assault/AK107.hpp b/SQF/dayz_code/Configs/CfgWeapons/Weapon/Assault/AK107.hpp new file mode 100644 index 000000000..ec4ee4834 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Weapon/Assault/AK107.hpp @@ -0,0 +1,157 @@ +class AK_107_kobra; +class AK107_Kobra_DZ : AK_107_kobra +{ + displayName = $STR_DZ_WPN_AK107_KOBRA_NAME; + + magazines[] = + { + 30Rnd_545x39_AK, + 30Rnd_545x39_AKSD, //Allow both SD and non-SD + 75Rnd_545x39_RPK + }; + + class Attachments + { + Attachment_GP25 = "AK107_GL_Kobra_DZ"; + }; + + class ItemActions + { + class RemoveKobra + { + text = $STR_DZ_ATT_KOBRA_RMVE; + script = "; ['Attachment_Kobra',_id,'AK107_DZ'] call player_removeAttachment"; + }; + }; +}; + +class AK_107_CP; +class AK107_DZ : AK_107_CP +{ + displayName = $STR_DZ_WPN_AK107_NAME; + + magazines[] = + { + 30Rnd_545x39_AK, + 30Rnd_545x39_AKSD, //Allow both SD and non-SD + 75Rnd_545x39_RPK + }; + + class Attachments + { + Attachment_Kobra = "AK107_Kobra_DZ"; + Attachment_PSO1 = "AK107_PSO_DZ"; + Attachment_GP25 = "AK107_GL_DZ"; + }; + + class ItemActions {}; +}; + +class AK_107_GL_CP; +class AK107_GL_DZ : AK_107_GL_CP +{ + displayName = $STR_DZ_WPN_AK107_GL_NAME; + + magazines[] = + { + 30Rnd_545x39_AK, + 30Rnd_545x39_AKSD, //Allow both SD and non-SD + 75Rnd_545x39_RPK + }; + + class Attachments + { + Attachment_Kobra = "AK107_GL_Kobra_DZ"; + Attachment_PSO1 = "AK107_GL_PSO_DZ"; + }; + class ItemActions + { + class RemoveGL + { + text = $STR_DZ_ATT_GP25_RMVE; + script = "; ['Attachment_GP25',_id,'AK107_DZ'] call player_removeAttachment"; + }; + }; +}; + +class AK_107_pso; +class AK107_PSO_DZ : AK_107_pso +{ + displayName = $STR_DZ_WPN_AK107_PSO1_NAME; + + magazines[] = + { + 30Rnd_545x39_AK, + 30Rnd_545x39_AKSD, //Allow both SD and non-SD + 75Rnd_545x39_RPK + }; + + class Attachments + { + Attachment_GP25 = "AK107_GL_PSO_DZ"; + }; + class ItemActions + { + class RemovePSO1 + { + text = $STR_DZ_ATT_PSO1_RMVE; + script = "; ['Attachment_PSO1',_id,'AK107_DZ'] call player_removeAttachment"; + }; + }; +}; + +class AK_107_GL_pso; +class AK107_GL_PSO_DZ : AK_107_GL_pso +{ + displayName = $STR_DZ_WPN_AK107_GL_PSO1_NAME; + + magazines[] = + { + 30Rnd_545x39_AK, + 30Rnd_545x39_AKSD, //Allow both SD and non-SD + 75Rnd_545x39_RPK + }; + + class Attachments {}; + class ItemActions + { + class RemovePSO1 + { + text = $STR_DZ_ATT_PSO1_RMVE; + script = "; ['Attachment_PSO1',_id,'AK107_GL_DZ'] call player_removeAttachment"; + }; + class RemoveGL + { + text = $STR_DZ_ATT_GP25_RMVE; + script = "; ['Attachment_GP25',_id,'AK107_PSO_DZ'] call player_removeAttachment"; + }; + }; +}; + +class AK_107_GL_kobra; +class AK107_GL_Kobra_DZ : AK_107_GL_kobra +{ + displayName = $STR_DZ_WPN_AK107_GL_KOBRA_NAME; + + magazines[] = + { + 30Rnd_545x39_AK, + 30Rnd_545x39_AKSD, //Allow both SD and non-SD + 75Rnd_545x39_RPK + }; + + class Attachments {}; + class ItemActions + { + class RemoveKobra + { + text = $STR_DZ_ATT_KOBRA_RMVE; + script = "; ['Attachment_Kobra',_id,'AK107_GL_DZ'] call player_removeAttachment"; + }; + class RemoveGL + { + text = $STR_DZ_ATT_GP25_RMVE; + script = "; ['Attachment_GP25',_id,'AK107_Kobra_DZ'] call player_removeAttachment"; + }; + }; +}; \ No newline at end of file diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Rifles.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Rifles.hpp index 90a557eb4..219637f30 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Rifles.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Rifles.hpp @@ -23,6 +23,30 @@ class AK_107_GL_pso { weight = 5.5; }; +class AK107_Kobra_DZ +{ + weight = 3.8; +}; +class AK107_GL_Kobra_DZ +{ + weight = 5.3; +}; +class AK107_PSO_DZ +{ + weight = 4; +}; +class AK107_GL_PSO_DZ +{ + weight = 5.5; +}; +class AK107_DZ +{ + weight = 3; +}; +class AK107_GL_DZ +{ + weight = 4.5; +}; class AKS_74_U { weight = 2.7; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 1f1894517..c84ab2a31 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -17261,7 +17261,60 @@ Leaf of a tobacco plant Blatt einer Tabakpflanze Лист табака с табачной плантации - + + + + + Kaliber: 5,45x39mm <br/>Schuss: 30 <br/>Eingesetzt in: AK-74, AK-74 Kobra, AKS-74U, AK-107 und RPK-74 + Caliber: 5.45x39mm <br/>Rounds: 30 <br/>Used in: AK-74, AK-74 Kobra, AKS-74U, AK-107 and RPK-74 + Calibro: 5,45x39 mm <br/>Munizioni: 30 <br/>Si usa in: AK-74, AK-74 Kobra, AKS-74U, AK-107 e RPK-74 + Calibre: 5,45x39 mm <br/>Cargas: 30 <br/>Uso: AK-74, AK-74 Kobra, AKS-74U, AK-107 y RPK-74 + Calibre : 5.45x39 mm <br/>Munitions : 30 <br/>Utilisé avec : AK-74, AK-74 Kobra, AKS-74U, AK-107 et RPK-74 + Kalibr: 5,45x39mm <br/>Nábojů: 30 <br/>Pro: AK-74, AK-74 Kobra, AKS-74U, AK-107 a RPK-74 + Патрон: 5.45x39 мм <br/>Количество: 30 <br/>Используется в: АК-74, АКС-74, АКС-74У, АК-107, РПК-74 + Kaliber: 5,45x39mm <br/>Naboje: 30 <br/>Używane w: AK-74, AK-74 Kobra, AKS-74U, AK-107 i RPK-74 + Kaliber: 5.45x39mm <br/> Töltények: 30 <br/> Hozzá tartozó fegyver: AK-74, AK-74 Kobra, AKS-74U, AK-107 and RPK-74 + + + Kaliber: 5,45x39mm <br/>Schuss: 75 <br/>Eingesetzt in: AK-74, AK-74 Kobra, AKS-74U, AK-107 und RPK-74 + Caliber: 5.45x39mm <br/>Rounds: 75 <br/>Used in: AK-74, AK-74 Kobra, AKS-74U, AK-107 and RPK-74 + Calibro: 5,45x39 mm <br/>Munizioni: 75 <br/>Si usa in: AK-74, AK-74 Kobra, AKS-74U, AK-107 e RPK-74 + Calibre: 5,45x39 mm <br/>Cargas: 75 <br/>Uso: AK-74, AK-74 Kobra, AKS-74U, AK-107 y RPK-74 + Calibre : 5.45x39 mm <br/>Munitions : 75 <br/>Utilisé avec : AK-74, AK-74 Kobra, AKS-74U, AK-107 et RPK-74 + Kalibr: 5,45x39mm <br/>Nábojů: 75 <br/>Pro: AK-74, AK-74 Kobra, AKS-74U, AK-107 a RPK-74 + Патрон: 5.45x39 мм <br/>Количество: 75 <br/>Используется в: АК-74, АКС-74, АКС-74У, АК-107, РПК-74 + 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 + + + + + AK-107 + АК-107 + + + AK-107 GP-25 + АК-107 ГП-25 + + + AK-107 Kobra + АК-107 Кобра + + + AK-107 GP-25 Kobra + АК-107 ГП-25 Кобра + + + AK-107 PSO-1 + АК-107 ПСО-1 + + + AK-107 GP-25 PSO-1 + АК-107 ГП-25 ПСО-1 + + Winter Ghillie Suit