diff --git a/SQF/dayz_code/Configs/CfgServerTrader/TraderBandit.hpp b/SQF/dayz_code/Configs/CfgServerTrader/TraderBandit.hpp index a282132c2..4a8dc6b3f 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/TraderBandit.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/TraderBandit.hpp @@ -1,11 +1,11 @@ class GUE_Soldier_MG { humanity = "hostile"; category[] = { - {"Ammunition","Ammunition"} - {"Clothing","Clothing"} - {"Helicopter Armed","HelicopterArmed"} - {"Military Armed","MilitaryArmed"} - {"Trucks Armed","TrucksArmed"} - {"Weapons","Weapons"} + {"Ammunition","BanditAmmunition"} + {"Clothing","BanditClothing"} + {"Helicopter Armed","BanditHelicopterArmed"} + {"Military Armed","BanditMilitaryArmed"} + {"Trucks Armed","BanditTrucksArmed"} + {"Weapons","BanditWeapons"} }; }; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/TraderFriendly.hpp b/SQF/dayz_code/Configs/CfgServerTrader/TraderFriendly.hpp index c6968c796..790481831 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/TraderFriendly.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/TraderFriendly.hpp @@ -1,74 +1,74 @@ class Profiteer4 { humanity = "friendly"; category[] = { - {"Bikes and ATV","BikesandATV"} - {"Buses and Vans","BusesandVans"} - {"Cargo Trucks","CargoTrucks"} - {"Fuel Trucks","FuelTrucks"} - {"Military Unarmed","MilitaryUnarmed"} - {"Trucks","Trucks"} - {"Used Cars","UsedCars"} - {"Utility Vehicles","UtilityVehicles"} + {"Bikes and ATV","FriendlyBikesandATV"} + {"Buses and Vans","FriendlyBusesandVans"} + {"Cargo Trucks","FriendlyCargoTrucks"} + {"Fuel Trucks","FriendlyFuelTrucks"} + {"Military Unarmed","FriendlyMilitaryUnarmed"} + {"Trucks","FriendlyTrucks"} + {"Used Cars","FriendlyUsedCars"} + {"Utility Vehicles","FriendlyUtilityVehicles"} }; }; class RU_WorkWoman1 { humanity = "friendly"; category[] = { - {"Backpacks","Backpacks"} - {"Clothes","Clothes"} - {"Cooked Meats","CookedMeats"} - {"Drinks","Drinks"} - {"Packaged Food","PackagedFood"} + {"Backpacks","FriendlyBackpacks"} + {"Clothes","FriendlyClothes"} + {"Cooked Meats","FriendlyCookedMeats"} + {"Drinks","FriendlyDrinks"} + {"Packaged Food","FriendlyPackagedFood"} }; }; class UN_CDF_Soldier_Pilot_EP1 { humanity = "friendly"; category[] = { - {"Bikes and ATV","BikesandATV"} - {"Buses and Vans","BusesandVans"} - {"Cargo Trucks","CargoTrucks"} - {"Fuel Trucks","FuelTrucks"} - {"Military Unarmed","MilitaryUnarmed"} - {"Trucks Unarmed","TrucksUnarmed"} - {"Used Cars","UsedCars"} - {"Utility Vehicles","UtilityVehicles"} + {"Bikes and ATV","FriendlyBikesandATV"} + {"Buses and Vans","FriendlyBusesandVans"} + {"Cargo Trucks","FriendlyCargoTrucks"} + {"Fuel Trucks","FriendlyFuelTrucks"} + {"Military Unarmed","FriendlyMilitaryUnarmed"} + {"Trucks Unarmed","FriendlyTrucksUnarmed"} + {"Used Cars","FriendlyUsedCars"} + {"Utility Vehicles","FriendlyUtilityVehicles"} }; }; class Rocker4 { humanity = "friendly"; category[] = { - {"Assault Rifle","AssaultRifle"} - {"Light Machine Gun","LightMachineGun"} - {"Pistols","Pistols"} - {"Shotguns and Single-shot","ShotgunsandSingleshot"} - {"Sniper Rifle","SniperRifle"} - {"Submachine Guns","SubmachineGuns"} + {"Assault Rifle","FriendlyAssaultRifle"} + {"Light Machine Gun","FriendlyLightMachineGun"} + {"Pistols","FriendlyPistols"} + {"Shotguns and Single-shot","FriendlyShotgunsandSingleshot"} + {"Sniper Rifle","FriendlySniperRifle"} + {"Submachine Guns","FriendlySubmachineGuns"} }; }; class RU_Citizen3 { humanity = "friendly"; category[] = { - {"Assault Rifle Ammo","AssaultRifleAmmo"} - {"Light Machine Gun Ammo","LightMachineGunAmmo"} - {"Pistol Ammo","PistolAmmo"} - {"Shotguns and Single-shot Ammo","ShotgunsandSingleshotAmmo"} - {"Sniper Rifle Ammo","SniperRifleAmmo"} - {"Submachine Gun Ammo","SubmachineGunAmmo"} + {"Assault Rifle Ammo","FriendlyAssaultRifleAmmo"} + {"Light Machine Gun Ammo","FriendlyLightMachineGunAmmo"} + {"Pistol Ammo","FriendlyPistolAmmo"} + {"Shotguns and Single-shot Ammo","FriendlyShotgunsandSingleshotAmmo"} + {"Sniper Rifle Ammo","FriendlySniperRifleAmmo"} + {"Submachine Gun Ammo","FriendlySubmachineGunAmmo"} }; }; class Woodlander1 { humanity = "friendly"; category[] = { - {"Building Supplies","BuildingSupplies"} - {"Toolbelt Items","ToolbeltItems"} - {"Vehicle Parts","VehicleParts"} + {"Building Supplies","FriendlyBuildingSupplies"} + {"Toolbelt Items","FriendlyToolbeltItems"} + {"Vehicle Parts","FriendlyVehicleParts"} }; }; class Dr_Annie_Baker_EP1 { humanity = "friendly"; category[] = { - {"Chem-lites/Flares","ChemlitesFlares"} - {"Medical Supplies","MedicalSupplies"} - {"Smoke Grenades","SmokeGrenades"} + {"Chem-lites/Flares","FriendlyChemlitesFlares"} + {"Medical Supplies","FriendlyMedicalSupplies"} + {"Smoke Grenades","FriendlySmokeGrenades"} }; }; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/TraderHero.hpp b/SQF/dayz_code/Configs/CfgServerTrader/TraderHero.hpp index ca66588bd..6372d869c 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/TraderHero.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/TraderHero.hpp @@ -1,11 +1,11 @@ class RU_Functionary1 { humanity = "hero"; category[] = { - {"Ammunition","Ammunition"} - {"Clothes","Clothes"} - {"Helicopter Armed","HelicopterArmed"} - {"Military Armed","MilitaryArmed"} - {"Trucks Armed","TrucksArmed"} - {"Weapons","Weapons"} + {"Ammunition","HeroAmmunition"} + {"Clothes","HeroClothes"} + {"Helicopter Armed","HeroHelicopterArmed"} + {"Military Armed","HeroMilitaryArmed"} + {"Trucks Armed","HeroTrucksArmed"} + {"Weapons","HeroWeapons"} }; }; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/TraderNeutral.hpp b/SQF/dayz_code/Configs/CfgServerTrader/TraderNeutral.hpp index 8730c9b39..98661dadc 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/TraderNeutral.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/TraderNeutral.hpp @@ -1,171 +1,171 @@ class Doctor { humanity = "neutral"; category[] = { - {"Chem-lites/Flares","ChemlitesFlares"} - {"Medical Supplies","MedicalSupplies"} - {"Smoke Grenades","SmokeGrenades"} + {"Chem-lites/Flares","NeutralChemlitesFlares"} + {"Medical Supplies","NeutralMedicalSupplies"} + {"Smoke Grenades","NeutralSmokeGrenades"} }; }; class HouseWife1 { humanity = "neutral"; category[] = { - {"Boats Armed","BoatsArmed"} - {"Boats Unarmed","BoatsUnarmed"} + {"Boats Armed","NeutralBoatsArmed"} + {"Boats Unarmed","NeutralBoatsUnarmed"} }; }; class TK_GUE_Soldier_5_EP1 { humanity = "neutral"; category[] = { - {"Building Supplies","BuildingSupplies"} - {"Toolbelt Items","ToolbeltItems"} - {"Vehicle Parts","VehicleParts"} + {"Building Supplies","NeutralBuildingSupplies"} + {"Toolbelt Items","NeutralToolbeltItems"} + {"Vehicle Parts","NeutralVehicleParts"} }; }; class RU_Citizen4 { humanity = "neutral"; category[] = { - {"Wholesale","Wholesale"} + {"Wholesale","NeutralWholesale"} }; }; class Worker3 { humanity = "neutral"; category[] = { - {"Bikes and ATV","BikesandATV"} - {"Buses and Vans","BusesandVans"} - {"Cargo Trucks","CargoTrucks"} - {"Fuel Trucks","FuelTrucks"} - {"Military Unarmed","MilitaryUnarmed"} - {"Trucks","Trucks"} - {"Used Cars","UsedCars"} - {"Utility Vehicles","UtilityVehicles"} + {"Bikes and ATV","NeutralBikesandATV"} + {"Buses and Vans","NeutralBusesandVans"} + {"Cargo Trucks","NeutralCargoTrucks"} + {"Fuel Trucks","NeutralFuelTrucks"} + {"Military Unarmed","NeutralMilitaryUnarmed"} + {"Trucks","NeutralTrucks"} + {"Used Cars","NeutralUsedCars"} + {"Utility Vehicles","NeutralUtilityVehicles"} }; }; class Dr_Hladik_EP1 { humanity = "neutral"; category[] = { - {"Chem-lites/Flares","ChemlitesFlares"} - {"Medical Supplies","MedicalSupplies"} - {"Smoke Grenades","SmokeGrenades"} + {"Chem-lites/Flares","NeutralChemlitesFlares"} + {"Medical Supplies","NeutralMedicalSupplies"} + {"Smoke Grenades","NeutralSmokeGrenades"} }; }; class RU_Villager3 { humanity = "neutral"; category[] = { - {"Boats Armed","BoatsArmed"} - {"Boats Unarmed","BoatsUnarmed"} + {"Boats Armed","NeutralBoatsArmed"} + {"Boats Unarmed","NeutralBoatsUnarmed"} }; }; class Worker2 { humanity = "neutral"; category[] = { - {"Airplanes","Airplanes"} - {"Helicopter Unarmed","HelicopterUnarmed"} + {"Airplanes","NeutralAirplanes"} + {"Helicopter Unarmed","NeutralHelicopterUnarmed"} }; }; class GUE_Woodlander2 { humanity = "neutral"; category[] = { - {"Black Market Ammo","BlackMarketAmmo"} - {"Black Market Weapons","BlackMarketWeapons"} - {"Explosives","Explosives"} + {"Black Market Ammo","NeutralBlackMarketAmmo"} + {"Black Market Weapons","NeutralBlackMarketWeapons"} + {"Explosives","NeutralExplosives"} }; }; class Rita_Ensler_EP1 { humanity = "neutral"; category[] = { - {"Backpacks","Backpacks"} - {"Clothes","Clothes"} - {"Cooked Meats","CookedMeats"} - {"Drinks","Drinks"} - {"Packaged Food","PackagedFood"} + {"Backpacks","NeutralBackpacks"} + {"Clothes","NeutralClothes"} + {"Cooked Meats","NeutralCookedMeats"} + {"Drinks","NeutralDrinks"} + {"Packaged Food","NeutralPackagedFood"} }; }; class Woodlander3 { humanity = "neutral"; category[] = { - {"Building Supplies","BuildingSupplies"} - {"Toolbelt Items","ToolbeltItems"} - {"Vehicle Parts","VehicleParts"} + {"Building Supplies","NeutralBuildingSupplies"} + {"Toolbelt Items","NeutralToolbeltItems"} + {"Vehicle Parts","NeutralVehicleParts"} }; }; class RU_Citizen1 { humanity = "neutral"; category[] = { - {"Wholesale","Wholesale"} + {"Wholesale","NeutralWholesale"} }; }; class Pilot_EP1 { humanity = "neutral"; category[] = { - {"Assault Rifle Ammo","AssaultRifleAmmo"} - {"Light Machine Gun Ammo","LightMachineGunAmmo"} - {"Pistol Ammo","PistolAmmo"} - {"Shotguns and Single-shot Ammo","ShotgunsandSingleshotAmmo"} - {"Sniper Rifle Ammo","SniperRifleAmmo"} - {"Submachine Gun Ammo","SubmachineGunAmmo"} + {"Assault Rifle Ammo","NeutralAssaultRifleAmmo"} + {"Light Machine Gun Ammo","NeutralLightMachineGunAmmo"} + {"Pistol Ammo","NeutralPistolAmmo"} + {"Shotguns and Single-shot Ammo","NeutralShotgunsandSingleshotAmmo"} + {"Sniper Rifle Ammo","NeutralSniperRifleAmmo"} + {"Submachine Gun Ammo","NeutralSubmachineGunAmmo"} }; }; class RU_Profiteer4 { humanity = "neutral"; category[] = { - {"Bikes and ATV","BikesandATV"} - {"Buses and Vans","BusesandVans"} - {"Cargo Trucks","CargoTrucks"} - {"Fuel Trucks","FuelTrucks"} - {"Military Unarmed","MilitaryUnarmed"} - {"Trucks","Trucks"} - {"Used Cars","UsedCars"} - {"Utility Vehicles","UtilityVehicles"} + {"Bikes and ATV","NeutralBikesandATV"} + {"Buses and Vans","NeutralBusesandVans"} + {"Cargo Trucks","NeutralCargoTrucks"} + {"Fuel Trucks","NeutralFuelTrucks"} + {"Military Unarmed","NeutralMilitaryUnarmed"} + {"Trucks","NeutralTrucks"} + {"Used Cars","NeutralUsedCars"} + {"Utility Vehicles","NeutralUtilityVehicles"} }; }; class Soldier_GL_M16A2_PMC { humanity = "neutral"; category[] = { - {"Black Market Ammo","BlackMarketAmmo"} - {"Black Market Weapons","BlackMarketWeapons"} - {"Explosives","Explosives"} + {"Black Market Ammo","NeutralBlackMarketAmmo"} + {"Black Market Weapons","NeutralBlackMarketWeapons"} + {"Explosives","NeutralExplosives"} }; }; class CIV_EuroMan01_EP1 { humanity = "neutral"; category[] = { - {"Assault Rifle","AssaultRifle"} - {"Light Machine Gun","LightMachineGun"} - {"Pistols","Pistols"} - {"Shotguns and Single-shot","ShotgunsandSingleshot"} - {"Sniper Rifle","SniperRifle"} - {"Submachine Guns","SubmachineGuns"} + {"Assault Rifle","NeutralAssaultRifle"} + {"Light Machine Gun","NeutralLightMachineGun"} + {"Pistols","NeutralPistols"} + {"Shotguns and Single-shot","NeutralShotgunsandSingleshot"} + {"Sniper Rifle","NeutralSniperRifle"} + {"Submachine Guns","NeutralSubmachineGuns"} }; }; class RU_WorkWoman5 { humanity = "neutral"; category[] = { - {"Backpacks","Backpacks"} - {"Clothes","Clothes"} - {"Cooked Meats","CookedMeats"} - {"Drinks","Drinks"} - {"Packaged Food","PackagedFood"} + {"Backpacks","NeutralBackpacks"} + {"Clothes","NeutralClothes"} + {"Cooked Meats","NeutralCookedMeats"} + {"Drinks","NeutralDrinks"} + {"Packaged Food","NeutralPackagedFood"} }; }; class TK_CIV_Takistani04_EP1 { humanity = "neutral"; category[] = { - {"Assault Rifle","AssaultRifle"} - {"Light Machine Gun","LightMachineGun"} - {"Pistols","Pistols"} - {"Shotguns and Single-shot","ShotgunsandSingleshot"} - {"Sniper Rifle","SniperRifle"} - {"Submachine Guns","SubmachineGuns"} + {"Assault Rifle","NeutralAssaultRifle"} + {"Light Machine Gun","NeutralLightMachineGun"} + {"Pistols","NeutralPistols"} + {"Shotguns and Single-shot","NeutralShotgunsandSingleshot"} + {"Sniper Rifle","NeutralSniperRifle"} + {"Submachine Guns","NeutralSubmachineGuns"} }; }; class CIV_EuroMan02_EP1 { humanity = "neutral"; category[] = { - {"Assault Rifle Ammo","AssaultRifleAmmo"} - {"Light Machine Gun Ammo","LightMachineGunAmmo"} - {"Pistol Ammo","PistolAmmo"} - {"Shotguns and Single-shot Ammo","ShotgunsandSingleshotAmmo"} - {"Sniper Rifle Ammo","SniperRifleAmmo"} - {"Submachine Gun Ammo","SubmachineGunAmmo"} + {"Assault Rifle Ammo","NeutralAssaultRifleAmmo"} + {"Light Machine Gun Ammo","NeutralLightMachineGunAmmo"} + {"Pistol Ammo","NeutralPistolAmmo"} + {"Shotguns and Single-shot Ammo","NeutralShotgunsandSingleshotAmmo"} + {"Sniper Rifle Ammo","NeutralSniperRifleAmmo"} + {"Submachine Gun Ammo","NeutralSubmachineGunAmmo"} }; }; diff --git a/Tools/TraderMigration/serverTraders2cfg.pl b/Tools/TraderMigration/serverTraders2cfg.pl index 4edb2d24e..929dc5b73 100644 --- a/Tools/TraderMigration/serverTraders2cfg.pl +++ b/Tools/TraderMigration/serverTraders2cfg.pl @@ -78,7 +78,7 @@ foreach my $traderhuman (keys $traderHumanity) { $cat->[1] ); while (my $row = $sth->fetchrow_hashref()) { - $catName = $row->{CatName}; + $catName = $traderhuman.$row->{CatName}; } $sth->finish(); $catName =~ s~ |-|/~~g;