diff --git a/SQF/dayz_code/Configs/CfgServerTrader/CfgServerTrader.hpp b/SQF/dayz_code/Configs/CfgServerTrader/CfgServerTrader.hpp deleted file mode 100644 index b53a336c3..000000000 --- a/SQF/dayz_code/Configs/CfgServerTrader/CfgServerTrader.hpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "TraderCategory.hpp" - -class CfgServerTrader { - - //Hero Trader for Example - class RU_Functionary1 { //Classname of the person - humanity = "hero"; //If Hero, normal or bandit - category[] = { //{"DisplayName","LinkedCategory"} - {"Ammunition","ammunition_1"}, - {"Clothes","clothes_1"}, - {"Helicopter Armed","heliarmed_1"}, - {"Military Armed","militaryarmed_1"}, - {"Trucks Armed","truckarmed_1"}, - {"Weapons","weapons_1"} - }; - }; -}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/cfgServerTrader.hpp b/SQF/dayz_code/Configs/cfgServerTrader.hpp index 3b6e9cee3..ba826dfbc 100644 --- a/SQF/dayz_code/Configs/cfgServerTrader.hpp +++ b/SQF/dayz_code/Configs/cfgServerTrader.hpp @@ -1,8 +1,10 @@ -#include "CfgServerTrader\TraderCategory.hpp" - class CfgServerTrader { #include "CfgServerTrader\TraderHero.hpp" #include "CfgServerTrader\TraderFriendly.hpp" #include "CfgServerTrader\TraderNeutral.hpp" #include "CfgServerTrader\TraderBandit.hpp" +}; + +class CfgTraderCategory { + #include "CfgTraderCategory\HeroAmmunition.hpp" }; \ No newline at end of file diff --git a/Tools/TraderMigration/serverTraders2cfg.pl b/Tools/TraderMigration/serverTraders2cfg.pl index 929dc5b73..b409483fe 100644 --- a/Tools/TraderMigration/serverTraders2cfg.pl +++ b/Tools/TraderMigration/serverTraders2cfg.pl @@ -7,12 +7,14 @@ use Data::Dumper; my $pathServerTradersSQF = '..\..\Server Files\MPMissions\DayZ_Epoch_11.Chernarus\server_traders.sqf'; my $pathServerTradersCfg = '..\..\SQF\dayz_code\Configs\CfgServerTrader\\'; +my $pathServerTraderCategoriesCfg = '..\..\SQF\dayz_code\Configs\CfgServerTraderCategories\\'; my $MySQL = DBI->connect('DBI:mysql:host=localhost;database=test2', 'root', 'root'); open(TRADERSQF, '<', $pathServerTradersSQF) or die $!; my $trader = ''; my $isTrader = 0; my @traders; +my $traderCategories = {}; while () { if (/^menu_(\w+)\s*=\s*\[/) { $trader = '{"'.$1.'":['; @@ -84,6 +86,7 @@ foreach my $traderhuman (keys $traderHumanity) { $catName =~ s~ |-|/~~g; $cfg .= "\t\t{\"".$cat->[0]."\",\"".$catName."\"}\n"; + $traderCategories->{$catName} = $cat->[1]; } $cfg .= "\t};\n"; $cfg .= "};\n" @@ -94,4 +97,16 @@ foreach my $traderhuman (keys $traderHumanity) { close(CFG); } +foreach my $traderCategory (keys $traderCategories) { + my $cfg = ''; + + $cfg .= "class ".$traderCategory." {\n"; + $cfg .= "\ttid = ".$traderCategories->{$traderCategory}.";\n"; + $cfg .= "};\n"; + + open(CFG, '>', $pathServerTraderCategoriesCfg.$traderCategory.'.hpp') or die $!; + print CFG $cfg; + close(CFG); +} + exit(0); \ No newline at end of file