From 695f72e10a540f2dd95f05dc71bc2b7aefea6ed9 Mon Sep 17 00:00:00 2001 From: HARLAN Date: Tue, 17 Dec 2013 13:30:05 -0500 Subject: [PATCH 1/2] #906 Vehicle upgrade parts to inventory --- Server Files/SQL/1_0_4_updates.sql | 37 ++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/Server Files/SQL/1_0_4_updates.sql b/Server Files/SQL/1_0_4_updates.sql index 6c4ab1d3b..68308601e 100644 --- a/Server Files/SQL/1_0_4_updates.sql +++ b/Server Files/SQL/1_0_4_updates.sql @@ -44,9 +44,9 @@ UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar10oz",1]' WHERE `item`='["m240_ UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar10oz",1]' WHERE `item`='["M249_m145_EP1_DZE",3]'; UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar",1]' WHERE `item`='["200Rnd_556x45_M249",1]'; -UPDATE `Traders_DATA` SET `buy`= '[2,"ItemBriefcase100oz",1]' WHERE `item`='["HMMWV_M1151_M2_CZ_DES_EP1_DZE",2]'; +UPDATE `Traders_DATA` SET `buy`= '[6,"ItemBriefcase100oz",1]' WHERE `item`='["HMMWV_M1151_M2_CZ_DES_EP1_DZE",2]'; UPDATE `Traders_DATA` SET `buy`= '[7,"ItemGoldBar10oz",1]' WHERE `item`='["GAZ_Vodnik_DZE",2]' and `buy`='[6,"ItemGoldBar10oz",1]'; -UPDATE `Traders_DATA` SET `sell`= '[3,"ItemGoldBar10oz",1]' WHERE `item`='["GAZ_Vodnik_DZE",2]'; +UPDATE `Traders_DATA` SET `sell`= '[5,"ItemGoldBar10oz",1]' WHERE `item`='["GAZ_Vodnik_DZE",2]'; UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar10oz",1]' WHERE `item`='["SUV_TK_CIV_EP1",2]'; UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar10oz",1]' WHERE `item`='["SUV_Blue",2]'; UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar10oz",1]' WHERE `item`='["SUV_Charcoal",2]'; @@ -75,3 +75,36 @@ UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar",1]' WHERE `item`='["ItemTrout UPDATE `Traders_DATA` SET `buy`= '[3,"ItemGoldBar",1]' WHERE `item`='["ItemSeaBassCooked",1]'; UPDATE `Traders_DATA` SET `buy`= '[4,"ItemGoldBar",1]' WHERE `item`='["ItemTunaCooked",1]'; UPDATE `Traders_DATA` SET `buy`= '[1,"ItemSilverBar10oz",1]' WHERE `item`='["FoodMRE",1]'; + +-- ---------------------------- +-- VEHICLE UPGRADE PARTS TO TRADER INVENTORY +-- ---------------------------- + +INSERT INTO `trader_items` VALUES(494, 'ItemORP', 1, 'Car Parts', 'trade_items'); +INSERT INTO `trader_items` VALUES(494, 'ItemAVE', 1, 'Car Parts', 'trade_items'); +INSERT INTO `trader_items` VALUES(494, 'ItemLRK', 1, 'Car Parts', 'trade_items'); +INSERT INTO `trader_items` VALUES(494, 'ItemTNK', 1, 'Car Parts', 'trade_items'); + +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemORP",1]', 192, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 509, 'trade_items'); +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemORP",1]', 247, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 531, 'trade_items'); +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemORP",1]', 246, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 664, 'trade_items'); +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemORP",1]', 250, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 677, 'trade_items'); +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemORP",1]', 250, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 682, 'trade_items'); + +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemAVE",1]', 192, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 509, 'trade_items'); +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemAVE",1]', 247, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 531, 'trade_items'); +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemAVE",1]', 246, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 664, 'trade_items'); +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemAVE",1]', 250, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 677, 'trade_items'); +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemAVE",1]', 250, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 682, 'trade_items'); + +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemLRK",1]', 192, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 509, 'trade_items'); +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemLRK",1]', 247, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 531, 'trade_items'); +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemLRK",1]', 246, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 664, 'trade_items'); +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemLRK",1]', 250, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 677, 'trade_items'); +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemLRK",1]', 250, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 682, 'trade_items'); + +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemTNK",1]', 192, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 509, 'trade_items'); +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemTNK",1]', 247, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 531, 'trade_items'); +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemTNK",1]', 246, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 664, 'trade_items'); +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemTNK",1]', 250, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 677, 'trade_items'); +INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemTNK",1]', 250, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 682, 'trade_items'); From d90eea8c983239a41d3977dc69f92f50ddaba933 Mon Sep 17 00:00:00 2001 From: HARLAN Date: Tue, 17 Dec 2013 13:32:14 -0500 Subject: [PATCH 2/2] quick SQL fix for insert igore --- Server Files/SQL/1_0_4_updates.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Server Files/SQL/1_0_4_updates.sql b/Server Files/SQL/1_0_4_updates.sql index 68308601e..0e7df868a 100644 --- a/Server Files/SQL/1_0_4_updates.sql +++ b/Server Files/SQL/1_0_4_updates.sql @@ -80,10 +80,10 @@ UPDATE `Traders_DATA` SET `buy`= '[1,"ItemSilverBar10oz",1]' WHERE `item`='["Foo -- VEHICLE UPGRADE PARTS TO TRADER INVENTORY -- ---------------------------- -INSERT INTO `trader_items` VALUES(494, 'ItemORP', 1, 'Car Parts', 'trade_items'); -INSERT INTO `trader_items` VALUES(494, 'ItemAVE', 1, 'Car Parts', 'trade_items'); -INSERT INTO `trader_items` VALUES(494, 'ItemLRK', 1, 'Car Parts', 'trade_items'); -INSERT INTO `trader_items` VALUES(494, 'ItemTNK', 1, 'Car Parts', 'trade_items'); +INSERT IGNORE INTO `trader_items` VALUES(NULL, 'ItemORP', 1, 'Car Parts', 'trade_items'); +INSERT IGNORE INTO `trader_items` VALUES(NULL, 'ItemAVE', 1, 'Car Parts', 'trade_items'); +INSERT IGNORE INTO `trader_items` VALUES(NULL, 'ItemLRK', 1, 'Car Parts', 'trade_items'); +INSERT IGNORE INTO `trader_items` VALUES(NULL, 'ItemTNK', 1, 'Car Parts', 'trade_items'); INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemORP",1]', 192, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 509, 'trade_items'); INSERT IGNORE INTO `Traders_DATA` VALUES(NULL, '["ItemORP",1]', 247, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 531, 'trade_items');