From 5c25993b67c350436901e67544e687526f911e04 Mon Sep 17 00:00:00 2001 From: Florian Kinder Date: Wed, 5 Feb 2014 19:11:58 +0100 Subject: [PATCH] Updated TraderCategory to latest epoch.sql --- .../Category/BanditHelicopterArmed.hpp | 6 +-- .../Category/BanditMilitaryArmed.hpp | 38 +++++++++---------- .../Category/FriendlyCargoTrucks.hpp | 4 +- .../Category/FriendlyMilitaryUnarmed.hpp | 8 ++-- .../Category/HeroHelicopterArmed.hpp | 6 +-- .../Category/HeroMilitaryArmed.hpp | 38 +++++++++---------- .../Category/NeutralCargoTrucks.hpp | 4 +- .../Category/NeutralExplosives.hpp | 2 +- .../Category/NeutralHelicopterUnarmed.hpp | 4 +- .../Category/NeutralMilitaryUnarmed.hpp | 8 ++-- Tools/TraderMigration/serverTraders2cfg.pl | 4 +- 11 files changed, 61 insertions(+), 61 deletions(-) diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/BanditHelicopterArmed.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/BanditHelicopterArmed.hpp index e60ca3ef0..5db2dd0da 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/BanditHelicopterArmed.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/BanditHelicopterArmed.hpp @@ -1,7 +1,7 @@ class Category_512 { class CH_47F_EP1_DZE { type = "trade_any_vehicle"; - buy[] = {2,"ItemBriefcase100oz"}; + buy[] = {4,"ItemBriefcase100oz"}; sell[] = {1,"ItemBriefcase100oz"}; }; class UH1H_DZE { @@ -11,8 +11,8 @@ class Category_512 { }; class Mi17_DZE { type = "trade_any_vehicle"; - buy[] = {1,"ItemBriefcase100oz"}; - sell[] = {5,"ItemGoldBar10oz"}; + buy[] = {2,"ItemBriefcase100oz"}; + sell[] = {1,"ItemBriefcase100oz"}; }; class UH60M_EP1_DZE { type = "trade_any_vehicle"; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/BanditMilitaryArmed.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/BanditMilitaryArmed.hpp index a728c58df..9877a3081 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/BanditMilitaryArmed.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/BanditMilitaryArmed.hpp @@ -1,32 +1,32 @@ class Category_569 { class HMMWV_M998A2_SOV_DES_EP1_DZE { type = "trade_any_vehicle"; - buy[] = {4,"ItemGoldBar10oz"}; - sell[] = {2,"ItemGoldBar10oz"}; + buy[] = {1,"ItemBriefcase100oz"}; + sell[] = {5,"ItemGoldBar10oz"}; }; class HMMWV_M1151_M2_CZ_DES_EP1_DZE { type = "trade_any_vehicle"; - buy[] = {1,"ItemBriefcase100oz"}; - sell[] = {5,"ItemGoldBar10oz"}; + buy[] = {4,"ItemBriefcase100oz"}; + sell[] = {1,"ItemBriefcase100oz"}; }; class LandRover_Special_CZ_EP1_DZE { - type = "trade_any_vehicle"; - buy[] = {2,"ItemGoldBar10oz"}; - sell[] = {1,"ItemGoldBar10oz"}; - }; - class LandRover_MG_TK_EP1_DZE { - type = "trade_any_vehicle"; - buy[] = {2,"ItemGoldBar10oz"}; - sell[] = {1,"ItemGoldBar10oz"}; - }; - class UAZ_MG_TK_EP1_DZE { - type = "trade_any_vehicle"; - buy[] = {2,"ItemGoldBar10oz"}; - sell[] = {1,"ItemGoldBar10oz"}; - }; - class GAZ_Vodnik_DZE { type = "trade_any_vehicle"; buy[] = {1,"ItemBriefcase100oz"}; sell[] = {5,"ItemGoldBar10oz"}; }; + class LandRover_MG_TK_EP1_DZE { + type = "trade_any_vehicle"; + buy[] = {6,"ItemGoldBar10oz"}; + sell[] = {3,"ItemGoldBar10oz"}; + }; + class UAZ_MG_TK_EP1_DZE { + type = "trade_any_vehicle"; + buy[] = {6,"ItemGoldBar10oz"}; + sell[] = {3,"ItemGoldBar10oz"}; + }; + class GAZ_Vodnik_DZE { + type = "trade_any_vehicle"; + buy[] = {2,"ItemBriefcase100oz"}; + sell[] = {1,"ItemBriefcase100oz"}; + }; }; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyCargoTrucks.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyCargoTrucks.hpp index 9466117f3..5ff50c0a2 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyCargoTrucks.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyCargoTrucks.hpp @@ -32,7 +32,7 @@ class Category_564 { class MTVR_DES_EP1 { type = "trade_any_vehicle"; buy[] = {2,"ItemGoldBar10oz"}; - sell[] = {1,"ItemGoldBar"}; + sell[] = {1,"ItemGoldBar10oz"}; }; class V3S_Civ { type = "trade_any_vehicle"; @@ -104,7 +104,7 @@ class Category_570 { class MTVR_DES_EP1 { type = "trade_any_vehicle"; buy[] = {2,"ItemGoldBar10oz"}; - sell[] = {1,"ItemGoldBar"}; + sell[] = {1,"ItemGoldBar10oz"}; }; class V3S_Civ { type = "trade_any_vehicle"; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyMilitaryUnarmed.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyMilitaryUnarmed.hpp index 5daebe2a9..57abcbe39 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyMilitaryUnarmed.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyMilitaryUnarmed.hpp @@ -21,8 +21,8 @@ class Category_491 { }; class GAZ_Vodnik_MedEvac { type = "trade_any_vehicle"; - buy[] = {9,"ItemGoldBar10oz"}; - sell[] = {6,"ItemGoldBar10oz"}; + buy[] = {1,"ItemBriefcase100oz"}; + sell[] = {5,"ItemGoldBar10oz"}; }; class HMMWV_DZ { type = "trade_any_vehicle"; @@ -63,8 +63,8 @@ class Category_599 { }; class GAZ_Vodnik_MedEvac { type = "trade_any_vehicle"; - buy[] = {9,"ItemGoldBar10oz"}; - sell[] = {6,"ItemGoldBar10oz"}; + buy[] = {1,"ItemBriefcase100oz"}; + sell[] = {5,"ItemGoldBar10oz"}; }; class HMMWV_DZ { type = "trade_any_vehicle"; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/HeroHelicopterArmed.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/HeroHelicopterArmed.hpp index d8c99d85b..625ee3fbc 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/HeroHelicopterArmed.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/HeroHelicopterArmed.hpp @@ -1,7 +1,7 @@ class Category_493 { class CH_47F_EP1_DZE { type = "trade_any_vehicle"; - buy[] = {2,"ItemBriefcase100oz"}; + buy[] = {4,"ItemBriefcase100oz"}; sell[] = {1,"ItemBriefcase100oz"}; }; class UH1H_DZE { @@ -11,8 +11,8 @@ class Category_493 { }; class Mi17_DZE { type = "trade_any_vehicle"; - buy[] = {1,"ItemBriefcase100oz"}; - sell[] = {5,"ItemGoldBar10oz"}; + buy[] = {2,"ItemBriefcase100oz"}; + sell[] = {1,"ItemBriefcase100oz"}; }; class UH60M_EP1_DZE { type = "trade_any_vehicle"; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/HeroMilitaryArmed.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/HeroMilitaryArmed.hpp index c69e47816..239e1280b 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/HeroMilitaryArmed.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/HeroMilitaryArmed.hpp @@ -1,32 +1,32 @@ class Category_562 { class HMMWV_M998A2_SOV_DES_EP1_DZE { type = "trade_any_vehicle"; - buy[] = {4,"ItemGoldBar10oz"}; - sell[] = {2,"ItemGoldBar10oz"}; + buy[] = {1,"ItemBriefcase100oz"}; + sell[] = {5,"ItemGoldBar10oz"}; }; class HMMWV_M1151_M2_CZ_DES_EP1_DZE { type = "trade_any_vehicle"; - buy[] = {1,"ItemBriefcase100oz"}; - sell[] = {5,"ItemGoldBar10oz"}; + buy[] = {4,"ItemBriefcase100oz"}; + sell[] = {1,"ItemBriefcase100oz"}; }; class LandRover_Special_CZ_EP1_DZE { - type = "trade_any_vehicle"; - buy[] = {2,"ItemGoldBar10oz"}; - sell[] = {1,"ItemGoldBar10oz"}; - }; - class LandRover_MG_TK_EP1_DZE { - type = "trade_any_vehicle"; - buy[] = {2,"ItemGoldBar10oz"}; - sell[] = {1,"ItemGoldBar10oz"}; - }; - class UAZ_MG_TK_EP1_DZE { - type = "trade_any_vehicle"; - buy[] = {2,"ItemGoldBar10oz"}; - sell[] = {1,"ItemGoldBar10oz"}; - }; - class GAZ_Vodnik_DZE { type = "trade_any_vehicle"; buy[] = {1,"ItemBriefcase100oz"}; sell[] = {5,"ItemGoldBar10oz"}; }; + class LandRover_MG_TK_EP1_DZE { + type = "trade_any_vehicle"; + buy[] = {6,"ItemGoldBar10oz"}; + sell[] = {3,"ItemGoldBar10oz"}; + }; + class UAZ_MG_TK_EP1_DZE { + type = "trade_any_vehicle"; + buy[] = {6,"ItemGoldBar10oz"}; + sell[] = {3,"ItemGoldBar10oz"}; + }; + class GAZ_Vodnik_DZE { + type = "trade_any_vehicle"; + buy[] = {2,"ItemBriefcase100oz"}; + sell[] = {1,"ItemBriefcase100oz"}; + }; }; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralCargoTrucks.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralCargoTrucks.hpp index 05fcf97bd..e2ac24ff6 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralCargoTrucks.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralCargoTrucks.hpp @@ -32,7 +32,7 @@ class Category_653 { class MTVR_DES_EP1 { type = "trade_any_vehicle"; buy[] = {2,"ItemGoldBar10oz"}; - sell[] = {1,"ItemGoldBar"}; + sell[] = {1,"ItemGoldBar10oz"}; }; class V3S_Civ { type = "trade_any_vehicle"; @@ -104,7 +104,7 @@ class Category_586 { class MTVR_DES_EP1 { type = "trade_any_vehicle"; buy[] = {2,"ItemGoldBar10oz"}; - sell[] = {1,"ItemGoldBar"}; + sell[] = {1,"ItemGoldBar10oz"}; }; class V3S_Civ { type = "trade_any_vehicle"; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralExplosives.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralExplosives.hpp index 695171f65..e23e1c48b 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralExplosives.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralExplosives.hpp @@ -6,7 +6,7 @@ class Category_529 { }; class PipeBomb { type = "trade_items"; - buy[] = {4,"ItemGoldBar10oz"}; + buy[] = {4,"ItemBriefcase100oz"}; sell[] = {2,"ItemGoldBar10oz"}; }; class 1Rnd_HE_M203 { diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralHelicopterUnarmed.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralHelicopterUnarmed.hpp index 83b9f5eb4..5ead174f6 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralHelicopterUnarmed.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralHelicopterUnarmed.hpp @@ -1,8 +1,8 @@ class Category_519 { class Mi17_Civilian_DZ { type = "trade_any_vehicle"; - buy[] = {4,"ItemGoldBar10oz"}; - sell[] = {2,"ItemGoldBar10oz"}; + buy[] = {2,"ItemBriefcase100oz"}; + sell[] = {1,"ItemBriefcase100oz"}; }; class AH6X_DZ { type = "trade_any_vehicle"; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralMilitaryUnarmed.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralMilitaryUnarmed.hpp index 815936adc..09fc06256 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralMilitaryUnarmed.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralMilitaryUnarmed.hpp @@ -21,8 +21,8 @@ class Category_658 { }; class GAZ_Vodnik_MedEvac { type = "trade_any_vehicle"; - buy[] = {9,"ItemGoldBar10oz"}; - sell[] = {6,"ItemGoldBar10oz"}; + buy[] = {1,"ItemBriefcase100oz"}; + sell[] = {5,"ItemGoldBar10oz"}; }; class HMMWV_DZ { type = "trade_any_vehicle"; @@ -63,8 +63,8 @@ class Category_598 { }; class GAZ_Vodnik_MedEvac { type = "trade_any_vehicle"; - buy[] = {9,"ItemGoldBar10oz"}; - sell[] = {6,"ItemGoldBar10oz"}; + buy[] = {1,"ItemBriefcase100oz"}; + sell[] = {5,"ItemGoldBar10oz"}; }; class HMMWV_DZ { type = "trade_any_vehicle"; diff --git a/Tools/TraderMigration/serverTraders2cfg.pl b/Tools/TraderMigration/serverTraders2cfg.pl index 93302b2cd..b89ba5767 100644 --- a/Tools/TraderMigration/serverTraders2cfg.pl +++ b/Tools/TraderMigration/serverTraders2cfg.pl @@ -6,8 +6,8 @@ use JSON; use Data::Dumper; my $pathServerTradersSQF = '..\..\Server Files\MPMissions\DayZ_Epoch_17.Chernarus\server_traders.sqf'; -my $pathServerTradersCfg = '..\..\SQF\dayz_code\Configs\CfgServerTrader\\'; -my $pathServerTraderCategoriesCfg = '..\..\SQF\dayz_code\Configs\CfgServerTrader\Category\\'; +my $pathServerTradersCfg = '..\..\SQF\dayz_epoch_b\CfgServerTrader\\'; +my $pathServerTraderCategoriesCfg = '..\..\SQF\dayz_epoch_b\CfgServerTrader\Category\\'; my $MySQL = DBI->connect('DBI:mysql:host=localhost;database=test2', 'root', 'root'); open(TRADERSQF, '<', $pathServerTradersSQF) or die $!;