W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 20:13:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added Humantiy Prefix to TraderCategory

Browse Source
This commit is contained in:
Florian Kinder
2014-02-04 14:12:33 +01:00
parent eba4091d93
commit 8606f7ba11
5 changed files with 128 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SQF/dayz_code/Configs/CfgServerTrader/TraderBandit.hpp
View File

@@ -1,11 +1,11 @@
class GUE_Soldier_MG { class GUE_Soldier_MG {
humanity = "hostile"; humanity = "hostile";
category[] = { category[] = {
{"Ammunition","Ammunition"} {"Ammunition","BanditAmmunition"}
{"Clothing","Clothing"} {"Clothing","BanditClothing"}
{"Helicopter Armed","HelicopterArmed"} {"Helicopter Armed","BanditHelicopterArmed"}
{"Military Armed","MilitaryArmed"} {"Military Armed","BanditMilitaryArmed"}
{"Trucks Armed","TrucksArmed"} {"Trucks Armed","BanditTrucksArmed"}
{"Weapons","Weapons"} {"Weapons","BanditWeapons"}
}; };
}; };

78
SQF/dayz_code/Configs/CfgServerTrader/TraderFriendly.hpp
View File

@@ -1,74 +1,74 @@
class Profiteer4 { class Profiteer4 {
humanity = "friendly"; humanity = "friendly";
category[] = { category[] = {
{"Bikes and ATV","BikesandATV"} {"Bikes and ATV","FriendlyBikesandATV"}
{"Buses and Vans","BusesandVans"} {"Buses and Vans","FriendlyBusesandVans"}
{"Cargo Trucks","CargoTrucks"} {"Cargo Trucks","FriendlyCargoTrucks"}
{"Fuel Trucks","FuelTrucks"} {"Fuel Trucks","FriendlyFuelTrucks"}
{"Military Unarmed","MilitaryUnarmed"} {"Military Unarmed","FriendlyMilitaryUnarmed"}
{"Trucks","Trucks"} {"Trucks","FriendlyTrucks"}
{"Used Cars","UsedCars"} {"Used Cars","FriendlyUsedCars"}
{"Utility Vehicles","UtilityVehicles"} {"Utility Vehicles","FriendlyUtilityVehicles"}
}; };
}; };
class RU_WorkWoman1 { class RU_WorkWoman1 {
humanity = "friendly"; humanity = "friendly";
category[] = { category[] = {
{"Backpacks","Backpacks"} {"Backpacks","FriendlyBackpacks"}
{"Clothes","Clothes"} {"Clothes","FriendlyClothes"}
{"Cooked Meats","CookedMeats"} {"Cooked Meats","FriendlyCookedMeats"}
{"Drinks","Drinks"} {"Drinks","FriendlyDrinks"}
{"Packaged Food","PackagedFood"} {"Packaged Food","FriendlyPackagedFood"}
}; };
}; };
class UN_CDF_Soldier_Pilot_EP1 { class UN_CDF_Soldier_Pilot_EP1 {
humanity = "friendly"; humanity = "friendly";
category[] = { category[] = {
{"Bikes and ATV","BikesandATV"} {"Bikes and ATV","FriendlyBikesandATV"}
{"Buses and Vans","BusesandVans"} {"Buses and Vans","FriendlyBusesandVans"}
{"Cargo Trucks","CargoTrucks"} {"Cargo Trucks","FriendlyCargoTrucks"}
{"Fuel Trucks","FuelTrucks"} {"Fuel Trucks","FriendlyFuelTrucks"}
{"Military Unarmed","MilitaryUnarmed"} {"Military Unarmed","FriendlyMilitaryUnarmed"}
{"Trucks Unarmed","TrucksUnarmed"} {"Trucks Unarmed","FriendlyTrucksUnarmed"}
{"Used Cars","UsedCars"} {"Used Cars","FriendlyUsedCars"}
{"Utility Vehicles","UtilityVehicles"} {"Utility Vehicles","FriendlyUtilityVehicles"}
}; };
}; };
class Rocker4 { class Rocker4 {
humanity = "friendly"; humanity = "friendly";
category[] = { category[] = {
{"Assault Rifle","AssaultRifle"} {"Assault Rifle","FriendlyAssaultRifle"}
{"Light Machine Gun","LightMachineGun"} {"Light Machine Gun","FriendlyLightMachineGun"}
{"Pistols","Pistols"} {"Pistols","FriendlyPistols"}
{"Shotguns and Single-shot","ShotgunsandSingleshot"} {"Shotguns and Single-shot","FriendlyShotgunsandSingleshot"}
{"Sniper Rifle","SniperRifle"} {"Sniper Rifle","FriendlySniperRifle"}
{"Submachine Guns","SubmachineGuns"} {"Submachine Guns","FriendlySubmachineGuns"}
}; };
}; };
class RU_Citizen3 { class RU_Citizen3 {
humanity = "friendly"; humanity = "friendly";
category[] = { category[] = {
{"Assault Rifle Ammo","AssaultRifleAmmo"} {"Assault Rifle Ammo","FriendlyAssaultRifleAmmo"}
{"Light Machine Gun Ammo","LightMachineGunAmmo"} {"Light Machine Gun Ammo","FriendlyLightMachineGunAmmo"}
{"Pistol Ammo","PistolAmmo"} {"Pistol Ammo","FriendlyPistolAmmo"}
{"Shotguns and Single-shot Ammo","ShotgunsandSingleshotAmmo"} {"Shotguns and Single-shot Ammo","FriendlyShotgunsandSingleshotAmmo"}
{"Sniper Rifle Ammo","SniperRifleAmmo"} {"Sniper Rifle Ammo","FriendlySniperRifleAmmo"}
{"Submachine Gun Ammo","SubmachineGunAmmo"} {"Submachine Gun Ammo","FriendlySubmachineGunAmmo"}
}; };
}; };
class Woodlander1 { class Woodlander1 {
humanity = "friendly"; humanity = "friendly";
category[] = { category[] = {
{"Building Supplies","BuildingSupplies"} {"Building Supplies","FriendlyBuildingSupplies"}
{"Toolbelt Items","ToolbeltItems"} {"Toolbelt Items","FriendlyToolbeltItems"}
{"Vehicle Parts","VehicleParts"} {"Vehicle Parts","FriendlyVehicleParts"}
}; };
}; };
class Dr_Annie_Baker_EP1 { class Dr_Annie_Baker_EP1 {
humanity = "friendly"; humanity = "friendly";
category[] = { category[] = {
{"Chem-lites/Flares","ChemlitesFlares"} {"Chem-lites/Flares","FriendlyChemlitesFlares"}
{"Medical Supplies","MedicalSupplies"} {"Medical Supplies","FriendlyMedicalSupplies"}
{"Smoke Grenades","SmokeGrenades"} {"Smoke Grenades","FriendlySmokeGrenades"}
}; };
}; };

12
SQF/dayz_code/Configs/CfgServerTrader/TraderHero.hpp
View File

@@ -1,11 +1,11 @@
class RU_Functionary1 { class RU_Functionary1 {
humanity = "hero"; humanity = "hero";
category[] = { category[] = {
{"Ammunition","Ammunition"} {"Ammunition","HeroAmmunition"}
{"Clothes","Clothes"} {"Clothes","HeroClothes"}
{"Helicopter Armed","HelicopterArmed"} {"Helicopter Armed","HeroHelicopterArmed"}
{"Military Armed","MilitaryArmed"} {"Military Armed","HeroMilitaryArmed"}
{"Trucks Armed","TrucksArmed"} {"Trucks Armed","HeroTrucksArmed"}
{"Weapons","Weapons"} {"Weapons","HeroWeapons"}
}; };
}; };

152
SQF/dayz_code/Configs/CfgServerTrader/TraderNeutral.hpp
View File

@@ -1,171 +1,171 @@
class Doctor { class Doctor {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Chem-lites/Flares","ChemlitesFlares"} {"Chem-lites/Flares","NeutralChemlitesFlares"}
{"Medical Supplies","MedicalSupplies"} {"Medical Supplies","NeutralMedicalSupplies"}
{"Smoke Grenades","SmokeGrenades"} {"Smoke Grenades","NeutralSmokeGrenades"}
}; };
}; };
class HouseWife1 { class HouseWife1 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Boats Armed","BoatsArmed"} {"Boats Armed","NeutralBoatsArmed"}
{"Boats Unarmed","BoatsUnarmed"} {"Boats Unarmed","NeutralBoatsUnarmed"}
}; };
}; };
class TK_GUE_Soldier_5_EP1 { class TK_GUE_Soldier_5_EP1 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Building Supplies","BuildingSupplies"} {"Building Supplies","NeutralBuildingSupplies"}
{"Toolbelt Items","ToolbeltItems"} {"Toolbelt Items","NeutralToolbeltItems"}
{"Vehicle Parts","VehicleParts"} {"Vehicle Parts","NeutralVehicleParts"}
}; };
}; };
class RU_Citizen4 { class RU_Citizen4 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Wholesale","Wholesale"} {"Wholesale","NeutralWholesale"}
}; };
}; };
class Worker3 { class Worker3 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Bikes and ATV","BikesandATV"} {"Bikes and ATV","NeutralBikesandATV"}
{"Buses and Vans","BusesandVans"} {"Buses and Vans","NeutralBusesandVans"}
{"Cargo Trucks","CargoTrucks"} {"Cargo Trucks","NeutralCargoTrucks"}
{"Fuel Trucks","FuelTrucks"} {"Fuel Trucks","NeutralFuelTrucks"}
{"Military Unarmed","MilitaryUnarmed"} {"Military Unarmed","NeutralMilitaryUnarmed"}
{"Trucks","Trucks"} {"Trucks","NeutralTrucks"}
{"Used Cars","UsedCars"} {"Used Cars","NeutralUsedCars"}
{"Utility Vehicles","UtilityVehicles"} {"Utility Vehicles","NeutralUtilityVehicles"}
}; };
}; };
class Dr_Hladik_EP1 { class Dr_Hladik_EP1 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Chem-lites/Flares","ChemlitesFlares"} {"Chem-lites/Flares","NeutralChemlitesFlares"}
{"Medical Supplies","MedicalSupplies"} {"Medical Supplies","NeutralMedicalSupplies"}
{"Smoke Grenades","SmokeGrenades"} {"Smoke Grenades","NeutralSmokeGrenades"}
}; };
}; };
class RU_Villager3 { class RU_Villager3 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Boats Armed","BoatsArmed"} {"Boats Armed","NeutralBoatsArmed"}
{"Boats Unarmed","BoatsUnarmed"} {"Boats Unarmed","NeutralBoatsUnarmed"}
}; };
}; };
class Worker2 { class Worker2 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Airplanes","Airplanes"} {"Airplanes","NeutralAirplanes"}
{"Helicopter Unarmed","HelicopterUnarmed"} {"Helicopter Unarmed","NeutralHelicopterUnarmed"}
}; };
}; };
class GUE_Woodlander2 { class GUE_Woodlander2 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Black Market Ammo","BlackMarketAmmo"} {"Black Market Ammo","NeutralBlackMarketAmmo"}
{"Black Market Weapons","BlackMarketWeapons"} {"Black Market Weapons","NeutralBlackMarketWeapons"}
{"Explosives","Explosives"} {"Explosives","NeutralExplosives"}
}; };
}; };
class Rita_Ensler_EP1 { class Rita_Ensler_EP1 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Backpacks","Backpacks"} {"Backpacks","NeutralBackpacks"}
{"Clothes","Clothes"} {"Clothes","NeutralClothes"}
{"Cooked Meats","CookedMeats"} {"Cooked Meats","NeutralCookedMeats"}
{"Drinks","Drinks"} {"Drinks","NeutralDrinks"}
{"Packaged Food","PackagedFood"} {"Packaged Food","NeutralPackagedFood"}
}; };
}; };
class Woodlander3 { class Woodlander3 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Building Supplies","BuildingSupplies"} {"Building Supplies","NeutralBuildingSupplies"}
{"Toolbelt Items","ToolbeltItems"} {"Toolbelt Items","NeutralToolbeltItems"}
{"Vehicle Parts","VehicleParts"} {"Vehicle Parts","NeutralVehicleParts"}
}; };
}; };
class RU_Citizen1 { class RU_Citizen1 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Wholesale","Wholesale"} {"Wholesale","NeutralWholesale"}
}; };
}; };
class Pilot_EP1 { class Pilot_EP1 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Assault Rifle Ammo","AssaultRifleAmmo"} {"Assault Rifle Ammo","NeutralAssaultRifleAmmo"}
{"Light Machine Gun Ammo","LightMachineGunAmmo"} {"Light Machine Gun Ammo","NeutralLightMachineGunAmmo"}
{"Pistol Ammo","PistolAmmo"} {"Pistol Ammo","NeutralPistolAmmo"}
{"Shotguns and Single-shot Ammo","ShotgunsandSingleshotAmmo"} {"Shotguns and Single-shot Ammo","NeutralShotgunsandSingleshotAmmo"}
{"Sniper Rifle Ammo","SniperRifleAmmo"} {"Sniper Rifle Ammo","NeutralSniperRifleAmmo"}
{"Submachine Gun Ammo","SubmachineGunAmmo"} {"Submachine Gun Ammo","NeutralSubmachineGunAmmo"}
}; };
}; };
class RU_Profiteer4 { class RU_Profiteer4 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Bikes and ATV","BikesandATV"} {"Bikes and ATV","NeutralBikesandATV"}
{"Buses and Vans","BusesandVans"} {"Buses and Vans","NeutralBusesandVans"}
{"Cargo Trucks","CargoTrucks"} {"Cargo Trucks","NeutralCargoTrucks"}
{"Fuel Trucks","FuelTrucks"} {"Fuel Trucks","NeutralFuelTrucks"}
{"Military Unarmed","MilitaryUnarmed"} {"Military Unarmed","NeutralMilitaryUnarmed"}
{"Trucks","Trucks"} {"Trucks","NeutralTrucks"}
{"Used Cars","UsedCars"} {"Used Cars","NeutralUsedCars"}
{"Utility Vehicles","UtilityVehicles"} {"Utility Vehicles","NeutralUtilityVehicles"}
}; };
}; };
class Soldier_GL_M16A2_PMC { class Soldier_GL_M16A2_PMC {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Black Market Ammo","BlackMarketAmmo"} {"Black Market Ammo","NeutralBlackMarketAmmo"}
{"Black Market Weapons","BlackMarketWeapons"} {"Black Market Weapons","NeutralBlackMarketWeapons"}
{"Explosives","Explosives"} {"Explosives","NeutralExplosives"}
}; };
}; };
class CIV_EuroMan01_EP1 { class CIV_EuroMan01_EP1 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Assault Rifle","AssaultRifle"} {"Assault Rifle","NeutralAssaultRifle"}
{"Light Machine Gun","LightMachineGun"} {"Light Machine Gun","NeutralLightMachineGun"}
{"Pistols","Pistols"} {"Pistols","NeutralPistols"}
{"Shotguns and Single-shot","ShotgunsandSingleshot"} {"Shotguns and Single-shot","NeutralShotgunsandSingleshot"}
{"Sniper Rifle","SniperRifle"} {"Sniper Rifle","NeutralSniperRifle"}
{"Submachine Guns","SubmachineGuns"} {"Submachine Guns","NeutralSubmachineGuns"}
}; };
}; };
class RU_WorkWoman5 { class RU_WorkWoman5 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Backpacks","Backpacks"} {"Backpacks","NeutralBackpacks"}
{"Clothes","Clothes"} {"Clothes","NeutralClothes"}
{"Cooked Meats","CookedMeats"} {"Cooked Meats","NeutralCookedMeats"}
{"Drinks","Drinks"} {"Drinks","NeutralDrinks"}
{"Packaged Food","PackagedFood"} {"Packaged Food","NeutralPackagedFood"}
}; };
}; };
class TK_CIV_Takistani04_EP1 { class TK_CIV_Takistani04_EP1 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Assault Rifle","AssaultRifle"} {"Assault Rifle","NeutralAssaultRifle"}
{"Light Machine Gun","LightMachineGun"} {"Light Machine Gun","NeutralLightMachineGun"}
{"Pistols","Pistols"} {"Pistols","NeutralPistols"}
{"Shotguns and Single-shot","ShotgunsandSingleshot"} {"Shotguns and Single-shot","NeutralShotgunsandSingleshot"}
{"Sniper Rifle","SniperRifle"} {"Sniper Rifle","NeutralSniperRifle"}
{"Submachine Guns","SubmachineGuns"} {"Submachine Guns","NeutralSubmachineGuns"}
}; };
}; };
class CIV_EuroMan02_EP1 { class CIV_EuroMan02_EP1 {
humanity = "neutral"; humanity = "neutral";
category[] = { category[] = {
{"Assault Rifle Ammo","AssaultRifleAmmo"} {"Assault Rifle Ammo","NeutralAssaultRifleAmmo"}
{"Light Machine Gun Ammo","LightMachineGunAmmo"} {"Light Machine Gun Ammo","NeutralLightMachineGunAmmo"}
{"Pistol Ammo","PistolAmmo"} {"Pistol Ammo","NeutralPistolAmmo"}
{"Shotguns and Single-shot Ammo","ShotgunsandSingleshotAmmo"} {"Shotguns and Single-shot Ammo","NeutralShotgunsandSingleshotAmmo"}
{"Sniper Rifle Ammo","SniperRifleAmmo"} {"Sniper Rifle Ammo","NeutralSniperRifleAmmo"}
{"Submachine Gun Ammo","SubmachineGunAmmo"} {"Submachine Gun Ammo","NeutralSubmachineGunAmmo"}
}; };
}; };

2
Tools/TraderMigration/serverTraders2cfg.pl
View File

@@ -78,7 +78,7 @@ foreach my $traderhuman (keys $traderHumanity) {
$cat->[1] $cat->[1]
); );
while (my $row = $sth->fetchrow_hashref()) { while (my $row = $sth->fetchrow_hashref()) {
$catName = $row->{CatName}; $catName = $traderhuman.$row->{CatName};
} }
$sth->finish(); $sth->finish();
$catName =~ s~ |-|/~~g; $catName =~ s~ |-|/~~g;