From 5bc36166a70ccb9421d7e960e967a97b64de1bb1 Mon Sep 17 00:00:00 2001
From: oiad <oiad@skeleton.net.nz>
Date: Sat, 8 Oct 2016 12:51:21 +1300
Subject: [PATCH] Rename plot pole from "30m_plot_kit" to "plot_pole_kit"

Sanity change since the plot pole is not fixed at 30 meters and is
configurable.
---
 SQF/dayz_code/Configs/CfgMagazines/DZE/Items.hpp         | 4 ++--
 SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp          | 2 +-
 .../Category/FriendlyBuildingSupplies.hpp                | 2 +-
 SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp      | 4 ++--
 .../R3F_Weight/Magazines/BuildingSupplies.hpp            | 4 ++--
 Server Files/SQL/1.0.6_Updates.sql                       | 9 +++++++++
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/SQF/dayz_code/Configs/CfgMagazines/DZE/Items.hpp b/SQF/dayz_code/Configs/CfgMagazines/DZE/Items.hpp
index 369bb4c46..00719984d 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Items.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Items.hpp
@@ -288,7 +288,7 @@ class ItemPlotDeed: CA_Magazine {
 			script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 			neednearby[] = {"workshop"};
 			requiretools[] = {"ItemToolbox"};
-			output[] = {{"30m_plot_kit",1}};
+			output[] = {{"plot_pole_kit",1}};
 			input[] = {{"ItemPlotDeed",1},{"ItemGoldBar10oz",2}};
 		};
 	};
@@ -407,4 +407,4 @@ class ItemBloodbag: CA_Magazine
 			script = "spawn player_useMeds;";
 		};
 	};
-};
\ No newline at end of file
+};
diff --git a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp
index 23878cc4a..b834e84e0 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/DZE/Misc.hpp
@@ -375,7 +375,7 @@ class wood_ramp_kit: CA_Magazine
 		};
 	};
 };
-class 30m_plot_kit: CA_Magazine
+class plot_pole_kit: CA_Magazine
 {
 	scope = public;
 	count = 1;
diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBuildingSupplies.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBuildingSupplies.hpp
index f3fb3e3e5..96d9fc5b7 100644
--- a/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBuildingSupplies.hpp
+++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/FriendlyBuildingSupplies.hpp
@@ -99,7 +99,7 @@ class Category_678 {
 		buy[] = {2,"ItemGoldBar"};
 		sell[] = {1,"ItemGoldBar"};
 	};
-	class 30m_plot_kit {
+	class plot_pole_kit {
 		type = "trade_items";
 		buy[] = {6,"ItemGoldBar10oz"};
 		sell[] = {6,"ItemGoldBar10oz"};
diff --git a/SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp
index a39bfc3e4..1b6bac386 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/Prop_Defs.hpp
@@ -458,9 +458,9 @@ class Plastic_Pole_EP1_DZ: Sign_1L_Noentry_EP1
 
 	scope = public;
 	offset[] = {0,2.5,0.3};
-	displayName = "30m Plot Pole";
+	displayName = $STR_EPOCH_PLAYER_246;
 	vehicleClass = "Fortifications";
-	removeoutput[] = {{"30m_plot_kit",1}};
+	removeoutput[] = {{"plot_pole_kit",1}};
 	requireplot = 0;
 	nounderground = 0;
 };
diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/BuildingSupplies.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/BuildingSupplies.hpp
index 8781f69c3..6f37e613b 100644
--- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/BuildingSupplies.hpp
+++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Magazines/BuildingSupplies.hpp
@@ -167,7 +167,7 @@ class PartWoodLumber
 {
 	weight = 2;
 };
-class 30m_plot_kit 
+class plot_pole_kit 
 {
 	weight = 0.02;
 };
@@ -226,4 +226,4 @@ class ItemFuelBarrelEmpty
 class ItemOilBarrel 
 {
 	weight = 140;
-}; 
\ No newline at end of file
+}; 
diff --git a/Server Files/SQL/1.0.6_Updates.sql b/Server Files/SQL/1.0.6_Updates.sql
index 09b177cee..fbcbcaba6 100644
--- a/Server Files/SQL/1.0.6_Updates.sql	
+++ b/Server Files/SQL/1.0.6_Updates.sql	
@@ -214,6 +214,15 @@ UPDATE character_data SET Backpack = REPLACE(Backpack, '"cinder_wall_kit"', '"ha
 UPDATE character_data SET Inventory = REPLACE(Inventory, '"cinder_wall_kit"', '"half_cinder_wall_kit"') WHERE INSTR(Inventory, '"cinder_wall_kit"') > 0;
 UPDATE object_data SET Inventory = REPLACE(Inventory, '"cinder_wall_kit"', '"half_cinder_wall_kit"') WHERE INSTR(Inventory, '"cinder_wall_kit"') > 0;
 
+-- ----------------------------
+-- 30m_plot_kit was renamed to plot_pole_kit for sanity
+-- ----------------------------
+
+UPDATE `Traders_DATA` SET `item` = '["plot_pole_kit",1]' WHERE `item` = '["30m_plot_kit",1]';
+UPDATE character_data SET Backpack = REPLACE(Backpack, '"30m_plot_kit"', '"plot_pole_kit"') WHERE INSTR(Backpack, '"30m_plot_kit"') > 0;
+UPDATE character_data SET Inventory = REPLACE(Inventory, '"30m_plot_kit"', '"plot_pole_kit"') WHERE INSTR(Inventory, '"30m_plot_kit"') > 0;
+UPDATE object_data SET Inventory = REPLACE(Inventory, '"30m_plot_kit"', '"plot_pole_kit"') WHERE INSTR(Inventory, '"30m_plot_kit"') > 0;
+
 -- ----------------------------
 -- Updated shotgun ammo names from 1.8.7
 -- ----------------------------