diff --git a/CHANGE LOG 1.0.6.2.txt b/CHANGE LOG 1.0.6.2.txt index ec1b17313..81df7bc94 100644 --- a/CHANGE LOG 1.0.6.2.txt +++ b/CHANGE LOG 1.0.6.2.txt @@ -28,6 +28,7 @@ [UPDATED] Removed server control panel, because it is abused by players and not currently used by admins [UPDATED] Moved large format strings in dayz_server to str formatText to avoid A2 2048 format character limit corrupting hive data in some cases. [UPDATED] Vehicles can now only be sold from the "Gear" sell menu. This prevents accidental selling when using the "sell all" feature on backpacks and vehicle inventories. +[UPDATED] Added all upgraded weapons to the traders as sell only for the sell price of the base weapon plus the sell price of attachments. This allows them to be sold without removing attachments first. #1982 @worldwidesorrow [FIXED] Kamaz refuel trucks no longer allow automatic refueling. #1855 @coresync2k @dreamforceinc [FIXED] Trees at POIs can be chopped down now. Other trees spawned with createVehicle can be added to dayz_treeTypes in variables.sqf to allow chopping them down. diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 0adc7c73c..e081c1ad4 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -49,7 +49,8 @@ sniperrifles[] = { {Loot_WEAPON, 1, CZ550_DZ}, //huntingrifle {Loot_WEAPON, 0.8, M24_des_EP1}, {Loot_WEAPON, 0.8, M24_DZ}, //M24 - {Loot_WEAPON, 0.7, BAF_LRR_scoped}, + {Loot_WEAPON, 0.6, BAF_LRR_scoped}, + {Loot_WEAPON, 0.6, BAF_LRR_scoped_W}, {Loot_WEAPON, 0.5, M107_DZ}, {Loot_WEAPON, 0.5, KSVK_DZE}, {Loot_WEAPON, 0.5, VSS_vintorez}, diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditWeapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditWeapons.hpp index 5c5739263..019cf699c 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/BanditWeapons.hpp @@ -14,7 +14,7 @@ class Category_627 { buy[] = {-1,"ItemGoldBar"}; // Sell only sell[] = {1,"ItemGoldBar10oz"}; }; - class FN_FAL_ANPVS4_DZE { // The DZE version has togglable night vision + class FN_FAL_ANPVS4_DZE { // _DZE has toggleable night vision type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; @@ -42,17 +42,17 @@ class Category_627 { class DMR_Gh_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {3,"ItemGoldBar10oz"}; + sell[] = {31,"ItemGoldBar"}; }; - class BAF_LRR_scoped { // Tan Lapua Variant + class BAF_LRR_scoped { //Tan Lapua type = "trade_weapons"; - buy[] = {6,"ItemGoldBar10oz"}; - sell[] = {3,"ItemGoldBar10oz"}; + buy[] = {7,"ItemGoldBar10oz"}; + sell[] = {4,"ItemGoldBar10oz"}; }; - class BAF_LRR_scoped_W { //Green Lapua Variant + class BAF_LRR_scoped_W { //Green Lapua type = "trade_weapons"; - buy[] = {6,"ItemGoldBar10oz"}; - sell[] = {3,"ItemGoldBar10oz"}; + buy[] = {7,"ItemGoldBar10oz"}; + sell[] = {4,"ItemGoldBar10oz"}; }; class m107_DZ { type = "trade_weapons"; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp index 9ba7d02c4..439d872b8 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyAssaultRifle.hpp @@ -559,12 +559,12 @@ class Category_485 { buy[] = {-1,"ItemGoldBar"}; // Sell only sell[] = {9,"ItemGoldBar"}; }; - class Sa58V_CCO_EP1 { // This rifle should be removed because it is redundant + class Sa58V_CCO_EP1 { //Desert camo no attachment support type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class Sa58V_RCO_EP1 { // This rifle should be removed because it is redundant + class Sa58V_RCO_EP1 { //Desert camo no attachment support type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyMedicalSupplies.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyMedicalSupplies.hpp index 9404fe1f0..f638eee8e 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyMedicalSupplies.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyMedicalSupplies.hpp @@ -118,6 +118,6 @@ class Category_541 { class ItemKiloHemp { type = "trade_items"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {2,"ItemGoldBar"}; + sell[] = {1,"ItemGoldBar"}; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyPistols.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyPistols.hpp index 9fe73ff16..eba7657c6 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyPistols.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyPistols.hpp @@ -7,7 +7,7 @@ class Category_489 { class M9_SD_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {2,"ItemGoldBar"}; + sell[] = {25,"ItemSilverBar10oz"}; }; class G17_DZ { type = "trade_weapons"; @@ -17,27 +17,27 @@ class Category_489 { class G17_FL_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {1,"ItemGoldBar"}; + sell[] = {12,"ItemSilverBar10oz"}; }; class G17_MFL_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {2,"ItemGoldBar"}; + sell[] = {22,"ItemSilverBar10oz"}; }; class G17_SD_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {2,"ItemGoldBar"}; + sell[] = {22,"ItemSilverBar10oz"}; }; class G17_SD_FL_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {3,"ItemGoldBar"}; + sell[] = {32,"ItemSilverBar10oz"}; }; class G17_SD_MFL_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {4,"ItemGoldBar"}; + sell[] = {42,"ItemSilverBar10oz"}; }; class Makarov_DZ { type = "trade_weapons"; @@ -47,7 +47,7 @@ class Category_489 { class Makarov_SD_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {1,"ItemGoldBar"}; + sell[] = {21,"ItemSilverBar10oz"}; }; class Revolver_DZ { type = "trade_weapons"; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp index e21bf4986..8f7e5b91f 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp @@ -102,57 +102,57 @@ class Category_574 { class Mosin_FL_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {1,"ItemGoldBar"}; + sell[] = {12,"ItemSilverBar10oz"}; }; class Mosin_MFL_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {2,"ItemGoldBar"}; + sell[] = {22,"ItemSilverBar10oz"}; }; class Mosin_Belt_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {2,"ItemGoldBar"}; + sell[] = {22,"ItemSilverBar10oz"}; }; class Mosin_Belt_FL_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {3,"ItemGoldBar"}; + sell[] = {32,"ItemSilverBar10oz"}; }; class Mosin_Belt_MFL_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {4,"ItemGoldBar"}; + sell[] = {42,"ItemSilverBar10oz"}; }; class Mosin_PU_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {4,"ItemGoldBar"}; + sell[] = {32,"ItemSilverBar10oz"}; }; class Mosin_PU_FL_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {5,"ItemGoldBar"}; + sell[] = {42,"ItemSilverBar10oz"}; }; class Mosin_PU_MFL_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {6,"ItemGoldBar"}; + sell[] = {52,"ItemSilverBar10oz"}; }; class Mosin_PU_Belt_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {6,"ItemGoldBar"}; + sell[] = {52,"ItemSilverBar10oz"}; }; class Mosin_PU_Belt_FL_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {7,"ItemGoldBar"}; + sell[] = {62,"ItemSilverBar10oz"}; }; class Mosin_PU_Belt_MFL_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {8,"ItemGoldBar"}; + sell[] = {72,"ItemSilverBar10oz"}; }; }; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySubmachineGuns.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySubmachineGuns.hpp index 84a45abb0..555f5a2ee 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySubmachineGuns.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySubmachineGuns.hpp @@ -22,7 +22,7 @@ class Category_488 { class MP5_SD_DZ { type = "trade_weapons"; buy[] = {-1,"ItemGoldBar"}; // Sell only - sell[] = {2,"ItemGoldBar"}; + sell[] = {22,"ItemSilverBar10oz"}; }; class Bizon_DZ { type = "trade_weapons"; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp index f69761e05..6cef90d63 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/NeutralBlackMarketAmmo.hpp @@ -44,6 +44,11 @@ class Category_527 { buy[] = {6,"ItemSilverBar10oz"}; sell[] = {3,"ItemSilverBar10oz"}; }; + class 100Rnd_556x45_M249 { + type = "trade_items"; + buy[] = {2,"ItemGoldBar"}; + sell[] = {1,"ItemGoldBar"}; + }; class 200Rnd_556x45_M249 { type = "trade_items"; buy[] = {4,"ItemGoldBar"}; @@ -54,6 +59,11 @@ class Category_527 { buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; + class 200Rnd_762x51_M240 { + type = "trade_items"; + buy[] = {-1,"ItemGoldBar"}; // Sell only + sell[] = {1,"ItemGoldBar"}; + }; class 20Rnd_9x39_SP5_VSS { type = "trade_items"; buy[] = {3,"ItemGoldBar"}; 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 652e3815f..b1f0c1504 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 @@ -32,6 +32,10 @@ class BAF_LRR_scoped { weight = 5.6; }; +class BAF_LRR_scoped_W +{ + weight = 5.6; +}; class Anzio_20 { weight = 14;