From 4c1b8706069d5c8f19258ee22be7bcdc2dbd0c01 Mon Sep 17 00:00:00 2001 From: HARLAN Date: Mon, 16 Dec 2013 11:38:28 -0500 Subject: [PATCH 1/7] #905 price review --- Server Files/SQL/1_0_4_updates.sql | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/Server Files/SQL/1_0_4_updates.sql b/Server Files/SQL/1_0_4_updates.sql index 6c070251b..fe25c863c 100644 --- a/Server Files/SQL/1_0_4_updates.sql +++ b/Server Files/SQL/1_0_4_updates.sql @@ -28,3 +28,50 @@ UPDATE `Traders_DATA` SET `sell`= '[1,"ItemSilverBar",1]' WHERE `sell`='[4,"Item UPDATE `Traders_DATA` SET `sell`= '[1,"ItemSilverBar",1]' WHERE `sell`='[3,"ItemCopperBar",1]'; UPDATE `Traders_DATA` SET `sell`= '[1,"ItemSilverBar",1]' WHERE `sell`='[2,"ItemCopperBar",1]'; UPDATE `Traders_DATA` SET `sell`= '[1,"ItemSilverBar",1]' WHERE `sell`='[1,"ItemCopperBar",1]'; + +-- ---------------------------- +-- PRICE REVIEW +-- ---------------------------- + +UPDATE `Traders_DATA` SET `buy`= '[4,"ItemGoldBar10oz",1]' WHERE `item`='["BAF_LRR_scoped",3]'; +UPDATE `Traders_DATA` SET `buy`= '[5,"ItemGoldBar",1]' WHERE `item`='["5Rnd_86x70_L115A1",1]'; +UPDATE `Traders_DATA` SET `buy`= '[3,"ItemGoldBar10oz",1]' WHERE `item`='["VSS_vintorez",3]'; +UPDATE `Traders_DATA` SET `buy`= '[3,"ItemGoldBar",1]' WHERE `item`='["20Rnd_9x39_SP5_VSS",1]'; +UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar10oz",1]' WHERE `item`='["MK_48_DZ",3]'; +UPDATE `Traders_DATA` SET `buy`= '[3,"ItemGoldBar",1]' WHERE `item`='["100Rnd_762x51_M240",1]'; +UPDATE `Traders_DATA` SET `buy`= '[3,"ItemGoldBar",1]' WHERE `item`='["100Rnd_762x54_PK",1]'; +UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar10oz",1]' WHERE `item`='["m240_scoped_EP1_DZE",3]'; +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`= '[1,"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 `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]'; +UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar10oz",1]' WHERE `item`='["SUV_Green",2]'; +UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar10oz",1]' WHERE `item`='["SUV_Orange",2]'; +UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar10oz",1]' WHERE `item`='["SUV_Pink",2]'; +UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar10oz",1]' WHERE `item`='["SUV_Red",2]'; +UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar10oz",1]' WHERE `item`='["SUV_Silver",2]'; +UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar10oz",1]' WHERE `item`='["SUV_White",2]'; +UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar10oz",1]' WHERE `item`='["SUV_Yellow",2]'; + + +UPDATE `Traders_DATA` SET `buy`= '[5,"ItemGoldBar",1]' WHERE `item`='["PartEngine",1]'; +UPDATE `Traders_DATA` SET `buy`= '[5,"ItemGoldBar",1]' WHERE `item`='["PartVRotor",1]'; +UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar",1]' WHERE `item`='["PartWheel",1]'; +UPDATE `Traders_DATA` SET `buy`= '[1,"ItemGoldBar",1]' WHERE `item`='["PartGlass",1]'; +UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar",1]' WHERE `item`='["PartGeneric",1]'; +UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar",1]' WHERE `item`='["PartFueltank",1]'; + + +UPDATE `Traders_DATA` SET `buy`= '[4,"ItemGoldBar",1]' WHERE `item`='["Binocular_Vector",3]'; +UPDATE `Traders_DATA` SET `buy`= '[4,"ItemGoldBar",1]' WHERE `item`='["NVGoggles",3]'; + +UPDATE `Traders_DATA` SET `buy`= '[1,"ItemGoldBar",1]' WHERE `item`='["FoodrabbitCooked",1]'; +UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar",1]' WHERE `item`='["ItemTroutCooked",1]'; +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]'; From 77ae969a74d1cc00185ebd544642995a2373f4d6 Mon Sep 17 00:00:00 2001 From: HARLAN Date: Mon, 16 Dec 2013 12:58:53 -0500 Subject: [PATCH 2/7] Update 1_0_4_updates.sql --- Server Files/SQL/1_0_4_updates.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server Files/SQL/1_0_4_updates.sql b/Server Files/SQL/1_0_4_updates.sql index fe25c863c..6c4ab1d3b 100644 --- a/Server Files/SQL/1_0_4_updates.sql +++ b/Server Files/SQL/1_0_4_updates.sql @@ -44,7 +44,7 @@ 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`= '[1,"ItemBriefcase100oz",1]' WHERE `item`='["HMMWV_M1151_M2_CZ_DES_EP1_DZE",2]'; +UPDATE `Traders_DATA` SET `buy`= '[2,"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 `buy`= '[2,"ItemGoldBar10oz",1]' WHERE `item`='["SUV_TK_CIV_EP1",2]'; From cacc600703b711e5fcca04a862152db89ffb6fed Mon Sep 17 00:00:00 2001 From: HARLAN Date: Mon, 16 Dec 2013 13:01:17 -0500 Subject: [PATCH 3/7] #919 modify global var into array --- SQF/dayz_code/init/variables.sqf | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 444e5e9ce..71a561106 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -665,11 +665,8 @@ if(!isDedicated) then { if(isNil "DZE_requireplot") then { DZE_requireplot = 1; }; - if(isNil "DZE_plotRadius") then { - DZE_plotRadius = 30; - }; - if(isNil "DZE_plotDistance") then { - DZE_plotDistance = 60; + if(isNil "DZE_PlotPole") then { + DZE_PlotPole = [30,60]; }; From ed3266d12460ac3ee1e65bf38c786a201f56b09b Mon Sep 17 00:00:00 2001 From: HARLAN Date: Mon, 16 Dec 2013 13:02:39 -0500 Subject: [PATCH 4/7] #919 modify global var into array --- SQF/dayz_code/actions/player_build.sqf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/actions/player_build.sqf b/SQF/dayz_code/actions/player_build.sqf index c108b4973..95d767a60 100644 --- a/SQF/dayz_code/actions/player_build.sqf +++ b/SQF/dayz_code/actions/player_build.sqf @@ -117,11 +117,11 @@ if((count _offset) <= 0) then { _isPole = (_classname == "Plastic_Pole_EP1_DZ"); _isLandFireDZ = (_classname == "Land_Fire_DZ"); -_distance = DZE_plotRadius; +_distance = DZE_PlotPole this select 0; _needText = localize "str_epoch_player_246"; if(_isPole) then { - _distance = DZE_plotDistance; + _distance = DZE_PlotPole this select 1; }; // check for near plot From 4aea9f9e3ccdc810671c2a1e7f6cdae061313d78 Mon Sep 17 00:00:00 2001 From: HARLAN Date: Mon, 16 Dec 2013 13:03:00 -0500 Subject: [PATCH 5/7] #919 modify global var into array --- SQF/dayz_code/init/variables.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 71a561106..594a61cfe 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -666,7 +666,7 @@ if(!isDedicated) then { DZE_requireplot = 1; }; if(isNil "DZE_PlotPole") then { - DZE_PlotPole = [30,60]; + DZE_PlotPole = [30,45]; }; From 40f8a0c9a097e1fafb3a863b1128f0017487c99f Mon Sep 17 00:00:00 2001 From: HARLAN Date: Mon, 16 Dec 2013 13:05:34 -0500 Subject: [PATCH 6/7] #919 modify global var into array --- SQF/dayz_code/compile/object_showPlotRadius.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/compile/object_showPlotRadius.sqf b/SQF/dayz_code/compile/object_showPlotRadius.sqf index 26db786b4..3645f94e2 100644 --- a/SQF/dayz_code/compile/object_showPlotRadius.sqf +++ b/SQF/dayz_code/compile/object_showPlotRadius.sqf @@ -7,7 +7,7 @@ _nearPlotPole = nearestObject [player, "Plastic_Pole_EP1_DZ", 3]; //"privatized" center variable -_BD_radius = 30; +_BD_radius = DZE_PlotPole this select 0; _BD_center = getPos _nearPlotPole; _objects = []; From ad17aa07afe0e2499c056a23719add8070523c33 Mon Sep 17 00:00:00 2001 From: HARLAN Date: Mon, 16 Dec 2013 13:06:32 -0500 Subject: [PATCH 7/7] #919 modify global var into array --- SQF/dayz_code/actions/maintain_area.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/actions/maintain_area.sqf b/SQF/dayz_code/actions/maintain_area.sqf index 4f2c36a82..b90c8f619 100644 --- a/SQF/dayz_code/actions/maintain_area.sqf +++ b/SQF/dayz_code/actions/maintain_area.sqf @@ -11,7 +11,7 @@ s_player_maintain_area_preview = 1; _target = cursorTarget; // Plastic_Pole_EP1_DZ _objectClasses = ["ModularItems", "DZE_Housebase"] + DZE_ExtraMaintain; -_range = 50; // set the max range for the maintain area +_range = ((DZE_PlotPole this select 0)+20); // set the max range for the maintain area _objects = nearestObjects [_target, _objectClasses, _range]; //filter to only those that have 10% damage