W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix DMR and M24 ammo price

Browse Source
This commit is contained in:
ebaydayz
2016-12-08 13:37:16 -05:00
parent f92b751ae3
commit 0d4d288d81
5 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGE LOG 1.0.6.1.txt
View File

@@ -11,5 +11,6 @@
[FIXED] Undefined variable dayz_clientPreload error on main menu during intro.sqs. #1810 @ndavalos @ebayShopper
[FIXED] Giving pain killers to another player no longer removes pain from the player giving the pain killers.
[FIXED] Occasional undefined error for text color attribute when salvaging vehicles. @ebayShopper
[FIXED] M24 ammo prices are now 1/4 of DMR ammo prices, so no profit can be made by combining M24 rounds. @looter809 @ebayShopper
[INFO] See Documents\CHANGE LOG 1.0.6.txt for the full list of 1.0.5.1 --> 1.0.6 changes.

4
SQF/dayz_code/Configs/CfgServerTrader/Category/BanditAmmunition.hpp
View File

@@ -26,8 +26,8 @@ class Category_577 {
};
class 20Rnd_762x51_DMR {
type = "trade_items";
buy[] = {6,"ItemGoldBar"};
sell[] = {3,"ItemGoldBar"};
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class 5Rnd_86x70_L115A1 {
type = "trade_items";

8
SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlySniperRifleAmmo.hpp
View File

@@ -6,13 +6,13 @@ class Category_624 {
};
class 5Rnd_762x51_M24 {
type = "trade_items";
buy[] = {1,"ItemSilverBar10oz"};
sell[] = {5,"ItemSilverBar"};
buy[] = {2,"ItemGoldBar"};
sell[] = {1,"ItemGoldBar"};
};
class 20Rnd_762x51_DMR {
type = "trade_items";
buy[] = {6,"ItemGoldBar"};
sell[] = {3,"ItemGoldBar"};
buy[] = {8,"ItemGoldBar"};
sell[] = {4,"ItemGoldBar"};
};
class 10Rnd_762x54_SVD {
type = "trade_items";

22
Server Files/SQL/1.0.6.1_Updates.sql Normal file
View File

@@ -0,0 +1,22 @@
/*
DayZ Epoch 1.0.6.1 Updates
RUN THIS FILE IF UPDATING AN EXISTING 106 DATABASE TO 1061.
NEW DATABASES SHOULD USE EPOCH.SQL INSTEAD.
EXISTING 1051 DATABASES SHOULD RUN 1.0.6_UPDATES.SQL FIRST, THEN RUN THIS FILE.
*/
-- ----------------------------
-- Fix M24 and DMR ammo prices so a profit can not be made by combining M24 rounds
-- ----------------------------
DELETE FROM `Traders_DATA` WHERE item = '["20Rnd_762x51_DMR"]';
INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["20Rnd_762x51_DMR",1]', 10, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 482, 'trade_items');
INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["20Rnd_762x51_DMR",1]', 10, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 614, 'trade_items');
INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["20Rnd_762x51_DMR",1]', 10, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 624, 'trade_items');
INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["20Rnd_762x51_DMR",1]', 10, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 647, 'trade_items');
DELETE FROM `Traders_DATA` WHERE item = '["5Rnd_762x51_M24"]';
INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["5Rnd_762x51_M24",1]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 482, 'trade_items');
INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["5Rnd_762x51_M24",1]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 527, 'trade_items');
INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["5Rnd_762x51_M24",1]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 614, 'trade_items');
INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["5Rnd_762x51_M24",1]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 624, 'trade_items');
INSERT IGNORE INTO `Traders_DATA` VALUES (NULL, '["5Rnd_762x51_M24",1]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 647, 'trade_items');

18
Server Files/SQL/epoch.sql
View File

@@ -345,7 +345,7 @@ INSERT INTO `Traders_DATA` VALUES(5027, '["20Rnd_762x51_FNFAL",1]', 10, '[4,"Ite
INSERT INTO `Traders_DATA` VALUES(5028, '["100Rnd_762x51_M240",1]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 481, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(5029, '["200Rnd_556x45_M249",1]', 10, '[4,"ItemGoldBar",1]', '[2,"ItemGoldBar",1]', 0, 481, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(5030, '["100Rnd_762x54_PK",1]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 481, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(5031, '["20Rnd_762x51_DMR",1]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 482, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(5031, '["20Rnd_762x51_DMR",1]', 10, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 482, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(5032, '["10Rnd_762x54_SVD",1]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 482, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(5036, '["30rnd_9x19_MP5",1]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 483, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(5037, '["30Rnd_9x19_MP5SD",1]', 10, '[4,"ItemSilverBar10oz",1]', '[2,"ItemSilverBar10oz",1]', 0, 483, 'trade_items');
@@ -500,7 +500,7 @@ INSERT INTO `Traders_DATA` VALUES(5352, '["8Rnd_B_Saiga12_74Slug",1]', 10, '[5,"
INSERT INTO `Traders_DATA` VALUES(5353, '["8Rnd_B_Saiga12_Pellets",1]', 10, '[5,"ItemSilverBar",1]', '[3,"ItemSilverBar",1]', 0, 527, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(5354, '["20Rnd_B_765x17_Ball",1]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 527, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(5355, '["10Rnd_762x54_SVD",1]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 527, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(5356, '["5Rnd_762x51_M24",1]', 10, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 527, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(5356, '["5Rnd_762x51_M24",1]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 527, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(5357, '["30Rnd_556x45_Stanag",1]', 10, '[5,"ItemSilverBar",1]', '[3,"ItemSilverBar",1]', 0, 527, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(5358, '["20Rnd_762x51_FNFAL",1]', 10, '[4,"ItemSilverBar10oz",1]', '[2,"ItemSilverBar10oz",1]', 0, 527, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(5366, '["HandGrenade_west",1]', 10, '[4,"ItemGoldBar",1]', '[2,"ItemGoldBar",1]', 0, 529, 'trade_items');
@@ -830,7 +830,7 @@ INSERT INTO `Traders_DATA` VALUES(6142, '["ItemSodaOrangeSherbet",1]', 10, '[4,"
INSERT INTO `Traders_DATA` VALUES(6143, '["FNFAL_DZ",3]', 10, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 485, 'trade_weapons');
INSERT INTO `Traders_DATA` VALUES(6144, '["30Rnd_545x39_AK",1]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 480, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6145, '["30Rnd_762x39_AK47",1]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 480, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6146, '["5Rnd_762x51_M24",1]', 10, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 482, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6146, '["5Rnd_762x51_M24",1]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 482, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6147, '["5Rnd_17HMR",1]', 10, '[1,"ItemGoldBar",1]', '[5,"ItemSilverBar10oz",1]', 0, 482, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6148, '["G36A_Camo_DZ",3]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 602, 'trade_weapons');
INSERT INTO `Traders_DATA` VALUES(6149, '["G36C_DZ",3]', 10, '[4,"ItemGoldBar",1]', '[2,"ItemGoldBar",1]', 0, 602, 'trade_weapons');
@@ -921,9 +921,9 @@ INSERT INTO `Traders_DATA` VALUES(6235, '["8Rnd_12Gauge_Buck",1]', 10, '[2,"Item
INSERT INTO `Traders_DATA` VALUES(6236, '["1Rnd_Arrow_Wood",1]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 613, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6237, '["12Rnd_Quiver_Wood",1]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 613, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6238, '["10Rnd_303British",1]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 613, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6239, '["20Rnd_762x51_DMR",1]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 614, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6239, '["20Rnd_762x51_DMR",1]', 10, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 614, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6240, '["10Rnd_762x54_SVD",1]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 614, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6242, '["5Rnd_762x51_M24",1]', 10, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 614, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6242, '["5Rnd_762x51_M24",1]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 614, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6243, '["5Rnd_17HMR",1]', 10, '[1,"ItemGoldBar",1]', '[5,"ItemSilverBar10oz",1]', 0, 614, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6244, '["G36A_Camo_DZ",3]', 10, '[6,"ItemGoldBar",1]', '[3,"ItemGoldBar",1]', 0, 615, 'trade_weapons');
INSERT INTO `Traders_DATA` VALUES(6245, '["G36C_DZ",3]', 10, '[4,"ItemGoldBar",1]', '[2,"ItemGoldBar",1]', 0, 615, 'trade_weapons');
@@ -992,9 +992,9 @@ INSERT INTO `Traders_DATA` VALUES(6309, '["8Rnd_12Gauge_Buck",1]', 10, '[2,"Item
INSERT INTO `Traders_DATA` VALUES(6310, '["1Rnd_Arrow_Wood",1]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 623, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6311, '["12Rnd_Quiver_Wood",1]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 623, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6312, '["10Rnd_303British",1]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 623, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6313, '["20Rnd_762x51_DMR",1]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 624, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6313, '["20Rnd_762x51_DMR",1]', 10, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 624, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6314, '["10Rnd_762x54_SVD",1]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 624, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6316, '["5Rnd_762x51_M24",1]', 10, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 624, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6316, '["5Rnd_762x51_M24",1]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 624, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6317, '["5Rnd_17HMR",1]', 10, '[1,"ItemGoldBar",1]', '[5,"ItemSilverBar10oz",1]', 0, 624, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6318, '["15Rnd_9x19_M9",1]', 10, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 625, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6319, '["15Rnd_9x19_M9SD",1]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 625, 'trade_items');
@@ -1184,9 +1184,9 @@ INSERT INTO `Traders_DATA` VALUES(6523, '["6Rnd_45ACP",1]', 10, '[2,"ItemSilverB
INSERT INTO `Traders_DATA` VALUES(6524, '["7Rnd_45ACP_1911",1]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 646, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6525, '["8Rnd_9x18_Makarov",1]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 646, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6526, '["8Rnd_9x18_MakarovSD",1]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 646, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6527, '["20Rnd_762x51_DMR",1]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 647, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6527, '["20Rnd_762x51_DMR",1]', 10, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 647, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6528, '["10Rnd_762x54_SVD",1]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 647, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6530, '["5Rnd_762x51_M24",1]', 10, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 647, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6530, '["5Rnd_762x51_M24",1]', 10, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 647, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6531, '["5Rnd_17HMR",1]', 10, '[1,"ItemGoldBar",1]', '[5,"ItemSilverBar10oz",1]', 0, 647, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6532, '["30rnd_9x19_MP5",1]', 10, '[2,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 648, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(6533, '["30Rnd_9x19_MP5SD",1]', 10, '[4,"ItemSilverBar10oz",1]', '[2,"ItemSilverBar10oz",1]', 0, 648, 'trade_items');