diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditMilitaryArmed.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditMilitaryArmed.hpp index 3af3cde2f..860b34a39 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditMilitaryArmed.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditMilitaryArmed.hpp @@ -14,11 +14,6 @@ class Category_569 { buy[] = {6,"ItemGoldBar10oz"}; sell[] = {3,"ItemGoldBar10oz"}; }; - class BTR40_MG_TK_INS_EP1 { - type = "trade_any_vehicle"; - buy[] = {1,"ItemBriefcase100oz"}; - sell[] = {5,"ItemGoldBar10oz"}; - }; class GAZ_Vodnik_DZE { type = "trade_any_vehicle"; buy[] = {2,"ItemBriefcase100oz"}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp index 439d872b8..cc9c04bf0 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp @@ -479,17 +479,133 @@ class Category_485 { buy[] = {8,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class L85_Holo_DZ { + //New L85 models by Streatman + class L85A2_DZ { + type = "trade_weapons"; + buy[] = {4,"ItemGoldBar"}; + sell[] = {2,"ItemGoldBar"}; + }; + class L85A2_FL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {3,"ItemGoldBar"}; + }; + class L85A2_MFL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {4,"ItemGoldBar"}; + }; + class L85A2_SD_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {6,"ItemGoldBar"}; + }; + class L85A2_SD_FL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {7,"ItemGoldBar"}; + }; + class L85A2_SD_MFL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {8,"ItemGoldBar"}; + }; + class L85A2_CCO_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {4,"ItemGoldBar"}; + }; + class L85A2_CCO_FL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {5,"ItemGoldBar"}; + }; + class L85A2_CCO_MFL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {6,"ItemGoldBar"}; + }; + class L85A2_CCO_SD_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {8,"ItemGoldBar"}; + }; + class L85A2_CCO_SD_FL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {9,"ItemGoldBar"}; + }; + class L85A2_CCO_SD_MFL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {1,"ItemGoldBar10oz"}; + }; + class L85A2_Holo_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {4,"ItemGoldBar"}; + }; + class L85A2_Holo_FL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {5,"ItemGoldBar"}; + }; + class L85A2_Holo_MFL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {6,"ItemGoldBar"}; + }; + class L85A2_Holo_SD_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {8,"ItemGoldBar"}; + }; + class L85A2_Holo_SD_FL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {9,"ItemGoldBar"}; + }; + class L85A2_Holo_SD_MFL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {1,"ItemGoldBar10oz"}; + }; + class L85A2_ACOG_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {6,"ItemGoldBar"}; + }; + class L85A2_ACOG_FL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {7,"ItemGoldBar"}; + }; + class L85A2_ACOG_MFL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {8,"ItemGoldBar"}; + }; + class L85A2_ACOG_SD_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {1,"ItemGoldBar10oz"}; + }; + class L85A2_ACOG_SD_FL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {11,"ItemGoldBar"}; + }; + class L85A2_ACOG_SD_MFL_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar"}; //Sell only + sell[] = {12,"ItemGoldBar"}; + }; + class BAF_L85A2_RIS_SUSAT { //Not sure if this should be kept in 1.0.6.2. type = "trade_weapons"; buy[] = {6,"ItemGoldBar"}; sell[] = {3,"ItemGoldBar"}; }; - class BAF_L85A2_RIS_SUSAT { - type = "trade_weapons"; - buy[] = {6,"ItemGoldBar"}; - sell[] = {3,"ItemGoldBar"}; - }; - class BAF_L85A2_RIS_ACOG { + class BAF_L85A2_RIS_ACOG { //Streatman's model L85A2_ACOG_DZ should replace this. type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySniperRifle.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySniperRifle.hpp index 8332792d2..d4c8811ac 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySniperRifle.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySniperRifle.hpp @@ -64,16 +64,27 @@ class Category_487 { buy[] = {-1,"ItemGoldBar10oz"}; // Sell only sell[] = {7,"ItemGoldBar"}; }; - class SVD_DZ { + //New SVD models by Streatman + class SVD_DZ { //SVD with iron sights type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class SVD_Gh_DZ { + class SVD_Gh_DZ { //SVD with iron sights and ghillie attachment type = "trade_weapons"; buy[] = {-1,"ItemGoldBar10oz"}; // Sell only sell[] = {7,"ItemGoldBar"}; }; + class SVD_PSO1_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar10oz"}; // Sell only + sell[] = {1,"ItemGoldBar10oz"}; + }; + class SVD_PSO1_Gh_DZ { + type = "trade_weapons"; + buy[] = {-1,"ItemGoldBar10oz"}; // Sell only + sell[] = {11,"ItemGoldBar"}; + }; class SVD_des_EP1 { // desert camo type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; 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 0ee62545d..e395a350a 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 @@ -151,14 +151,106 @@ class AK_74_GL_kobra { weight = 4.2; }; -class BAF_L85A2_RIS_Holo +class L85A2_DZ +{ + weight = 5; +}; +class L85A2_FL_DZ { weight = 5.2; }; +class L85A2_MFL_DZ +{ + weight = 5.2; +}; +class L85A2_SD_DZ +{ + weight = 5.2; +}; +class L85A2_SD_FL_DZ +{ + weight = 5.4; +}; +class L85A2_SD_MFL_DZ +{ + weight = 5.4; +}; +class L85A2_CCO_DZ +{ + weight = 5.2; +}; +class L85A2_CCO_FL_DZ +{ + weight = 5.4; +}; +class L85A2_CCO_MFL_DZ +{ + weight = 5.4; +}; +class L85A2_CCO_SD_DZ +{ + weight = 5.4; +}; +class L85A2_CCO_SD_FL_DZ +{ + weight = 5.6; +}; +class L85A2_CCO_SD_MFL_DZ +{ + weight = 5.6; +}; class L85_Holo_DZ { weight = 5.2; }; +class L85A2_Holo_FL_DZ +{ + weight = 5.4; +}; +class L85A2_Holo_MFL_DZ +{ + weight = 5.4; +}; +class L85A2_Holo_SD_DZ +{ + weight = 5.4; +}; +class L85A2_Holo_SD_FL_DZ +{ + weight = 5.6; +}; +class L85A2_Holo_SD_MFL_DZ +{ + weight = 5.6; +}; +class L85A2_ACOG_DZ +{ + weight = 5.2; +}; +class L85A2_ACOG_FL_DZ +{ + weight = 5.4; +}; +class L85A2_ACOG_MFL_DZ +{ + weight = 5.4; +}; +class L85A2_ACOG_SD_DZ +{ + weight = 5.4; +}; +class L85A2_ACOG_SD_FL_DZ +{ + weight = 5.6; +}; +class L85A2_ACOG_SD_MFL_DZ +{ + weight = 5.6; +}; +class BAF_L85A2_RIS_Holo +{ + weight = 5.2; +}; class BAF_L85A2_UGL_Holo { weight = 6.2; diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Snipers.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Snipers.hpp index b1f0c1504..bc4383532 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Snipers.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Snipers.hpp @@ -117,18 +117,26 @@ class SVD weight = 6.2; }; class SVD_DZ +{ + weight = 6; +}; +class SVD_Gh_DZ +{ + weight = 6.1; +}; +class SVD_PSO1_DZ { weight = 6.2; }; -class SVD_Camo +class SVD_PSO1_Gh_DZ { weight = 6.3; }; -class SVD_Gh_DZ +class SVD_Camo { weight = 6.3; }; class VSS_Vintorez { weight = 3.2; -}; \ No newline at end of file +};