diff --git a/Documents/Epoch 1.0.7 Classnames/CfgWeapons all.txt b/Documents/Epoch 1.0.7 Classnames/CfgWeapons all.txt index bd7cf5347..d74bc3843 100644 --- a/Documents/Epoch 1.0.7 Classnames/CfgWeapons all.txt +++ b/Documents/Epoch 1.0.7 Classnames/CfgWeapons all.txt @@ -964,6 +964,7 @@ DesertEagle_DZ DesertEagle_Gold_DZ DesertEagle_Silver_DZ DesertEagle_Modern_DZ +Sa61_DZ MeleeHatchet MeleeCrowbar MeleeMachete diff --git a/Documents/Epoch 1.0.7 Classnames/Epoch Weapons.txt b/Documents/Epoch 1.0.7 Classnames/Epoch Weapons.txt index fbae78e95..5592595dd 100644 --- a/Documents/Epoch 1.0.7 Classnames/Epoch Weapons.txt +++ b/Documents/Epoch 1.0.7 Classnames/Epoch Weapons.txt @@ -719,4 +719,5 @@ CZ75SP_SD_DZ DesertEagle_DZ DesertEagle_Gold_DZ DesertEagle_Silver_DZ -DesertEagle_Modern_DZ \ No newline at end of file +DesertEagle_Modern_DZ +Sa61_DZ \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp b/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp index 63ca569f3..93885a5b2 100644 --- a/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp +++ b/SQF/dayz_code/Configs/CfgExtra/snappoints.hpp @@ -748,6 +748,7 @@ class SnapBuilding { }; class StorageShed2_DZ: StorageShed_DZ {}; + class StorageShed_Preview_DZ: StorageShed_DZ {}; class WoodShack_DZ { snapTo[] = { diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 15a52a847..92b48dfe4 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -214,7 +214,8 @@ weaponsCZ[] = {Loot_WEAPON, 2, CZ75P_DZ}, {Loot_WEAPON, 2, CZ75D_DZ}, {Loot_WEAPON, 2, CZ75SP_DZ}, - {Loot_WEAPON, 1, CZ75SP_SD_DZ}, + {Loot_WEAPON, 1, CZ75SP_SD_DZ}, + {Loot_WEAPON, 5, Sa61_DZ}, // Bolt action rifles and shotguns {Loot_WEAPON, 5, USAS12_DZ}, diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/PlasticWaterbottle.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/PlasticWaterbottle.hpp index 3f9ab7f23..b95077d01 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/PlasticWaterbottle.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/PlasticWaterbottle.hpp @@ -94,6 +94,11 @@ class ItemPlasticWaterBottleBoiled : ItemWaterBottle class ItemActions { + class Consume + { + text = $STR_ACTIONS_DRINK2; + script = "spawn player_consume"; + }; class Crafting { text = $STR_CRAFTING_HERBALDRINK; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp index 8581f469b..4f9ba5734 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp @@ -16,9 +16,7 @@ class ItemWaterBottle : FoodDrink class ItemActions : ItemActions { - class Consume : Consume - { - }; + class Consume : Consume {}; class Empty { @@ -47,6 +45,11 @@ class ItemWaterBottleBoiled : ItemWaterBottle class ItemActions { + class Consume + { + text = $STR_ACTIONS_DRINK2; + script = "spawn player_consume"; + }; class Crafting { text = $STR_CRAFTING_HERBALDRINK; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp index 0e891efd7..aceccf43c 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp @@ -82,6 +82,22 @@ class Category_7 { class LandRover_Special_CZ_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; class UAZ_MG_TK_EP1_DZE {type = "trade_any_vehicle";buy[] = {6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; class UAZ_MG_TK_EP1_DZ {type = "trade_any_vehicle";buy[] = {-6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; + class UAZ_MG_CDF_DZE {type = "trade_any_vehicle";buy[] = {6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; + class UAZ_MG_CDF_DZ {type = "trade_any_vehicle";buy[] = {-6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; + class UAZ_MG_INS_DZE {type = "trade_any_vehicle";buy[] = {6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; + class UAZ_MG_INS_DZ {type = "trade_any_vehicle";buy[] = {-6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; + class UAZ_AGS30_CDF_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_CDF_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_INS_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_INS_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_TK_EP1_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_TK_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_RU_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_RU_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_RUST_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_RUST_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_WINTER_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_WINTER_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; class BAF_Jackal2_L2A1_D_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class BAF_Jackal2_L2A1_D_DZ {type = "trade_any_vehicle";buy[] = {-2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class BAF_Jackal2_L2A1_W_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; @@ -97,13 +113,19 @@ class Category_7 { class GAZ_Vodnik_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class GAZ_Vodnik_DZ {type = "trade_any_vehicle";buy[] = {-2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class BRDM2_HQ_TK_GUE_EP1_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; - class BRDM2_HQ_TK_GUE_EP1_DZ {type = "trade_any_vehicle";buy[] = {-2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; + class BRDM2_HQ_TK_GUE_EP1_DZ {type = "trade_any_vehicle";buy[] = {-2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; + class BRDM2_HQ_CDF_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; + class BRDM2_HQ_CDF_DZ {type = "trade_any_vehicle";buy[] = {-2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class HMMWV_Armored_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; class HMMWV_Armored_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; class HMMWV_M2_DZE {type = "trade_any_vehicle";buy[] = {3,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class HMMWV_M2_DZ_DZ {type = "trade_any_vehicle";buy[] = {-3,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class HMMWV_M998A2_SOV_DES_EP1_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; class HMMWV_M998A2_SOV_DES_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class HMMWV_MK19_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; + class HMMWV_MK19_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; + class HMMWV_DES_MK19_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; + class HMMWV_DES_MK19_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class HMMWV_M1151_M2_CZ_DES_EP1_DZE {type = "trade_any_vehicle";buy[] = {4,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class HMMWV_M1151_M2_CZ_DES_EP1_DZ {type = "trade_any_vehicle";buy[] = {-4,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class T810A_PKT_ACR_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/BlackMarket.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/BlackMarket.hpp index 8009aa8bd..6ff07259c 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/BlackMarket.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/BlackMarket.hpp @@ -18,7 +18,7 @@ class Category_11 { class 20Rnd_B_Usas12_Pellets {type = "trade_items";buy[] = {8,"ItemSilverBar"};sell[] = {5,"ItemSilverBar"};}; class 20Rnd_B_AA12_Pellets {type = "trade_items";buy[] = {8,"ItemSilverBar"};sell[] = {5,"ItemSilverBar"};}; class 20Rnd_B_AA12_74Slug {type = "trade_items";buy[] = {8,"ItemSilverBar"};sell[] = {5,"ItemSilverBar"};}; - class 1Rnd_Bolt_Explosive {type = "trade_items";buy[] = {4,"ItemSilverBar"};sell[] = {2,"ItemSilverBar"};}; + class 1Rnd_Bolt_Explosive {type = "trade_items";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};}; class HandGrenade_west {type = "trade_items";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};}; class HandGrenade_east {type = "trade_items";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};}; class 1Rnd_HE_M203 {type = "trade_items";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp index bf3e81c65..885cc9c71 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp @@ -82,6 +82,22 @@ class Category_2 { class LandRover_Special_CZ_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; class UAZ_MG_TK_EP1_DZE {type = "trade_any_vehicle";buy[] = {6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; class UAZ_MG_TK_EP1_DZ {type = "trade_any_vehicle";buy[] = {-6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; + class UAZ_MG_CDF_DZE {type = "trade_any_vehicle";buy[] = {6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; + class UAZ_MG_CDF_DZ {type = "trade_any_vehicle";buy[] = {-6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; + class UAZ_MG_INS_DZE {type = "trade_any_vehicle";buy[] = {6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; + class UAZ_MG_INS_DZ {type = "trade_any_vehicle";buy[] = {-6,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; + class UAZ_AGS30_CDF_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_CDF_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_INS_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_INS_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_TK_EP1_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_TK_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_RU_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_RU_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_RUST_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_RUST_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_WINTER_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class UAZ_AGS30_WINTER_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; class BAF_Jackal2_L2A1_D_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class BAF_Jackal2_L2A1_D_DZ {type = "trade_any_vehicle";buy[] = {-2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class BAF_Jackal2_L2A1_W_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; @@ -97,13 +113,19 @@ class Category_2 { class GAZ_Vodnik_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class GAZ_Vodnik_DZ {type = "trade_any_vehicle";buy[] = {-2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class BRDM2_HQ_TK_GUE_EP1_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; - class BRDM2_HQ_TK_GUE_EP1_DZ {type = "trade_any_vehicle";buy[] = {-2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; + class BRDM2_HQ_TK_GUE_EP1_DZ {type = "trade_any_vehicle";buy[] = {-2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; + class BRDM2_HQ_CDF_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; + class BRDM2_HQ_CDF_DZ {type = "trade_any_vehicle";buy[] = {-2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class HMMWV_Armored_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; class HMMWV_Armored_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; class HMMWV_M2_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class HMMWV_M2_DZ_DZ {type = "trade_any_vehicle";buy[] = {-12,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class HMMWV_M998A2_SOV_DES_EP1_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; class HMMWV_M998A2_SOV_DES_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; + class HMMWV_MK19_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; + class HMMWV_MK19_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; + class HMMWV_DES_MK19_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; + class HMMWV_DES_MK19_DZ {type = "trade_any_vehicle";buy[] = {-1,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class HMMWV_M1151_M2_CZ_DES_EP1_DZE {type = "trade_any_vehicle";buy[] = {4,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class HMMWV_M1151_M2_CZ_DES_EP1_DZ {type = "trade_any_vehicle";buy[] = {-4,"ItemBriefcase100oz"};sell[] = {1,"ItemBriefcase100oz"};}; class T810A_PKT_ACR_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemBriefcase100oz"};sell[] = {5,"ItemGoldBar10oz"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Vehicles.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Vehicles.hpp index c78af7882..74d48422a 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Vehicles.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Vehicles.hpp @@ -102,7 +102,9 @@ class Category_42 { class UralCivil2_DZE {type = "trade_any_vehicle";buy[] = {1,"ItemGoldBar10oz"};sell[] = {5,"ItemGoldBar"};}; class UralSupply_TK_EP1_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; class UralReammo_CDF_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; - class UralRepair_CDF_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; + class UralReammo_INS_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; + class UralRepair_CDF_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; + class UralRepair_INS_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; class V3S_Open_TK_CIV_EP1_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; class V3S_Open_TK_EP1_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; class V3S_Civ_DZE {type = "trade_any_vehicle";buy[] = {2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; @@ -131,6 +133,8 @@ class Category_42 { //Fuel Trucks class Category_43 { class UralRefuel_TK_EP1_DZ {type = "trade_any_vehicle";buy[] = {7,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; + class UralRefuel_INS_DZE {type = "trade_any_vehicle";buy[] = {7,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; + class UralRefuel_CDF_DZE {type = "trade_any_vehicle";buy[] = {7,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; class V3S_Refuel_TK_GUE_EP1_DZ {type = "trade_any_vehicle";buy[] = {7,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; class KamazRefuel_DZ {type = "trade_any_vehicle";buy[] = {7,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; class MtvrRefuel_DES_EP1_DZ {type = "trade_any_vehicle";buy[] = {7,"ItemGoldBar10oz"};sell[] = {3,"ItemGoldBar10oz"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp index 0cfa9430f..0404b408e 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Weapons.hpp @@ -84,7 +84,7 @@ class Category_13 { //Submachine Guns class Category_14 { - class Sa61_EP1 {type = "trade_weapons";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};}; + class Sa61_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};}; class Mac10_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};}; class TEC9_DZ {type = "trade_weapons";buy[] = {1,"ItemGoldBar"};sell[] = {5,"ItemSilverBar10oz"};}; class PDW_DZ {type = "trade_weapons";buy[] = {4,"ItemGoldBar"};sell[] = {2,"ItemGoldBar"};}; @@ -440,7 +440,7 @@ class Category_16 { class Groza9_Sniper_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {2,"ItemGoldBar10oz"};}; class VAL_DZ {type = "trade_weapons";buy[] = {3,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; class VAL_Kobra_DZ {type = "trade_weapons";buy[] = {-2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; - class VAL_POS1_DZ {type = "trade_weapons";buy[] = {-2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; + class VAL_PSO1_DZ {type = "trade_weapons";buy[] = {-2,"ItemGoldBar10oz"};sell[] = {1,"ItemGoldBar10oz"};}; class AKS74U_DZ {type = "trade_weapons";buy[] = {2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class AKS74U_Kobra_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {3,"ItemGoldBar"};}; class AKS74U_SD_DZ {type = "trade_weapons";buy[] = {-1,"ItemGoldBar"};sell[] = {4,"ItemGoldBar"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Bandit.hpp b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Bandit.hpp index 2bfd47cd8..cece3b8bb 100644 --- a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Bandit.hpp +++ b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Bandit.hpp @@ -82,6 +82,22 @@ class Category_7 { class LandRover_Special_CZ_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; class UAZ_MG_TK_EP1_DZE {type = "trade_any_vehicle";buy[] = {6000,"worth"};sell[] = {3000,"worth"};}; class UAZ_MG_TK_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {3000,"worth"};}; + class UAZ_MG_CDF_DZE {type = "trade_any_vehicle";buy[] = {6000,"worth"};sell[] = {3000,"worth"};}; + class UAZ_MG_CDF_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {3000,"worth"};}; + class UAZ_MG_INS_DZE {type = "trade_any_vehicle";buy[] = {6000,"worth"};sell[] = {3000,"worth"};}; + class UAZ_MG_INS_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {3000,"worth"};}; + class UAZ_AGS30_CDF_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_CDF_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_INS_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_INS_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_TK_EP1_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_TK_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_RU_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_RU_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_RUST_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_RUST_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_WINTER_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_WINTER_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; class BAF_Jackal2_L2A1_D_DZE {type = "trade_any_vehicle";buy[] = {20000,"worth"};sell[] = {10000,"worth"};}; class BAF_Jackal2_L2A1_D_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {10000,"worth"};}; class BAF_Jackal2_L2A1_W_DZE {type = "trade_any_vehicle";buy[] = {20000,"worth"};sell[] = {10000,"worth"};}; @@ -97,15 +113,21 @@ class Category_7 { class GAZ_Vodnik_DZE {type = "trade_any_vehicle";buy[] = {20000,"worth"};sell[] = {10000,"worth"};}; class GAZ_Vodnik_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {10000,"worth"};}; class BRDM2_HQ_TK_GUE_EP1_DZE {type = "trade_any_vehicle";buy[] = {20000,"worth"};sell[] = {10000,"worth"};}; - class BRDM2_HQ_TK_GUE_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {10000,"worth"};}; + class BRDM2_HQ_TK_GUE_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {10000,"worth"};}; + class BRDM2_HQ_CDF_DZE {type = "trade_any_vehicle";buy[] = {20000,"worth"};sell[] = {10000,"worth"};}; + class BRDM2_HQ_CDF_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {10000,"worth"};}; class HMMWV_Armored_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; class HMMWV_Armored_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; class HMMWV_M2_DZE {type = "trade_any_vehicle";buy[] = {30000,"worth"};sell[] = {10000,"worth"};}; class HMMWV_M2_DZ_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {10000,"worth"};}; class HMMWV_M998A2_SOV_DES_EP1_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; class HMMWV_M998A2_SOV_DES_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; + class HMMWV_MK19_DZE {type = "trade_any_vehicle";buy[] = {20000,"worth"};sell[] = {10000,"worth"};}; + class HMMWV_MK19_DZ {type = "trade_any_vehicle";buy[] = {-20000,"worth"};sell[] = {10000,"worth"};}; + class HMMWV_DES_MK19_DZE {type = "trade_any_vehicle";buy[] = {20000,"worth"};sell[] = {10000,"worth"};}; + class HMMWV_DES_MK19_DZ {type = "trade_any_vehicle";buy[] = {-20000,"worth"};sell[] = {10000,"worth"};}; class HMMWV_M1151_M2_CZ_DES_EP1_DZE {type = "trade_any_vehicle";buy[] = {40000,"worth"};sell[] = {10000,"worth"};}; - class HMMWV_M1151_M2_CZ_DES_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {10000,"worth"};}; + class HMMWV_M1151_M2_CZ_DES_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {10000,"worth"};}; class T810A_PKT_ACR_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; class T810A_PKT_ACR_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; class T810A_PKT_DES_ACR_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/BlackMarket.hpp b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/BlackMarket.hpp index 6b4086b34..80201edbe 100644 --- a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/BlackMarket.hpp +++ b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/BlackMarket.hpp @@ -18,7 +18,7 @@ class Category_11 { class 20Rnd_B_Usas12_Pellets {type = "trade_items";buy[] = {8,"worth"};sell[] = {5,"worth"};}; class 20Rnd_B_AA12_Pellets {type = "trade_items";buy[] = {8,"worth"};sell[] = {5,"worth"};}; class 20Rnd_B_AA12_74Slug {type = "trade_items";buy[] = {8,"worth"};sell[] = {5,"worth"};}; - class 1Rnd_Bolt_Explosive {type = "trade_items";buy[] = {4,"worth"};sell[] = {2,"worth"};}; + class 1Rnd_Bolt_Explosive {type = "trade_items";buy[] = {400,"worth"};sell[] = {200,"worth"};}; class HandGrenade_west {type = "trade_items";buy[] = {400,"worth"};sell[] = {200,"worth"};}; class HandGrenade_east {type = "trade_items";buy[] = {400,"worth"};sell[] = {200,"worth"};}; class 1Rnd_HE_M203 {type = "trade_items";buy[] = {400,"worth"};sell[] = {200,"worth"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Hero.hpp b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Hero.hpp index 90b9608c9..f0cbbee50 100644 --- a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Hero.hpp +++ b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Hero.hpp @@ -82,6 +82,22 @@ class Category_2 { class LandRover_Special_CZ_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; class UAZ_MG_TK_EP1_DZE {type = "trade_any_vehicle";buy[] = {6000,"worth"};sell[] = {3000,"worth"};}; class UAZ_MG_TK_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {3000,"worth"};}; + class UAZ_MG_CDF_DZE {type = "trade_any_vehicle";buy[] = {6000,"worth"};sell[] = {3000,"worth"};}; + class UAZ_MG_CDF_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {3000,"worth"};}; + class UAZ_MG_INS_DZE {type = "trade_any_vehicle";buy[] = {6000,"worth"};sell[] = {3000,"worth"};}; + class UAZ_MG_INS_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {3000,"worth"};}; + class UAZ_AGS30_CDF_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_CDF_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_INS_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_INS_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_TK_EP1_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_TK_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_RU_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_RU_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_RUST_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_RUST_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_WINTER_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; + class UAZ_AGS30_WINTER_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; class BAF_Jackal2_L2A1_D_DZE {type = "trade_any_vehicle";buy[] = {20000,"worth"};sell[] = {10000,"worth"};}; class BAF_Jackal2_L2A1_D_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {10000,"worth"};}; class BAF_Jackal2_L2A1_W_DZE {type = "trade_any_vehicle";buy[] = {20000,"worth"};sell[] = {10000,"worth"};}; @@ -97,13 +113,19 @@ class Category_2 { class GAZ_Vodnik_DZE {type = "trade_any_vehicle";buy[] = {20000,"worth"};sell[] = {10000,"worth"};}; class GAZ_Vodnik_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {10000,"worth"};}; class BRDM2_HQ_TK_GUE_EP1_DZE {type = "trade_any_vehicle";buy[] = {20000,"worth"};sell[] = {10000,"worth"};}; - class BRDM2_HQ_TK_GUE_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {10000,"worth"};}; + class BRDM2_HQ_TK_GUE_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {10000,"worth"};}; + class BRDM2_HQ_CDF_DZE {type = "trade_any_vehicle";buy[] = {20000,"worth"};sell[] = {10000,"worth"};}; + class BRDM2_HQ_CDF_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {10000,"worth"};}; class HMMWV_Armored_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; class HMMWV_Armored_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; class HMMWV_M2_DZE {type = "trade_any_vehicle";buy[] = {20000,"worth"};sell[] = {10000,"worth"};}; class HMMWV_M2_DZ_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {10000,"worth"};}; class HMMWV_M998A2_SOV_DES_EP1_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; - class HMMWV_M998A2_SOV_DES_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; + class HMMWV_M998A2_SOV_DES_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {5000,"worth"};}; + class HMMWV_MK19_DZE {type = "trade_any_vehicle";buy[] = {20000,"worth"};sell[] = {10000,"worth"};}; + class HMMWV_MK19_DZ {type = "trade_any_vehicle";buy[] = {-20000,"worth"};sell[] = {10000,"worth"};}; + class HMMWV_DES_MK19_DZE {type = "trade_any_vehicle";buy[] = {20000,"worth"};sell[] = {10000,"worth"};}; + class HMMWV_DES_MK19_DZ {type = "trade_any_vehicle";buy[] = {-20000,"worth"};sell[] = {10000,"worth"};}; class HMMWV_M1151_M2_CZ_DES_EP1_DZE {type = "trade_any_vehicle";buy[] = {40000,"worth"};sell[] = {10000,"worth"};}; class HMMWV_M1151_M2_CZ_DES_EP1_DZ {type = "trade_any_vehicle";buy[] = {-1,"worth"};sell[] = {10000,"worth"};}; class T810A_PKT_ACR_DZE {type = "trade_any_vehicle";buy[] = {10000,"worth"};sell[] = {5000,"worth"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Vehicles.hpp b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Vehicles.hpp index f92374cce..1fde29ae2 100644 --- a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Vehicles.hpp +++ b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Vehicles.hpp @@ -102,7 +102,9 @@ class Category_42 { class UralCivil2_DZE {type = "trade_any_vehicle";buy[] = {1000,"worth"};sell[] = {500,"worth"};}; class UralSupply_TK_EP1_DZE {type = "trade_any_vehicle";buy[] = {2000,"worth"};sell[] = {1000,"worth"};}; class UralReammo_CDF_DZE {type = "trade_any_vehicle";buy[] = {2000,"worth"};sell[] = {1000,"worth"};}; - class UralRepair_CDF_DZE {type = "trade_any_vehicle";buy[] = {2000,"worth"};sell[] = {1000,"worth"};}; + class UralReammo_INS_DZE {type = "trade_any_vehicle";buy[] = {2000,"worth"};sell[] = {1000,"worth"};}; + class UralRepair_CDF_DZE {type = "trade_any_vehicle";buy[] = {2000,"worth"};sell[] = {1000,"worth"};}; + class UralRepair_INS_DZE {type = "trade_any_vehicle";buy[] = {2000,"worth"};sell[] = {1000,"worth"};}; class V3S_Open_TK_CIV_EP1_DZE {type = "trade_any_vehicle";buy[] = {2000,"worth"};sell[] = {1000,"worth"};}; class V3S_Open_TK_EP1_DZE {type = "trade_any_vehicle";buy[] = {2000,"worth"};sell[] = {1000,"worth"};}; class V3S_Civ_DZE {type = "trade_any_vehicle";buy[] = {2000,"worth"};sell[] = {1000,"worth"};}; @@ -131,6 +133,8 @@ class Category_42 { //Fuel Trucks class Category_43 { class UralRefuel_TK_EP1_DZ {type = "trade_any_vehicle";buy[] = {7000,"worth"};sell[] = {3000,"worth"};}; + class UralRefuel_INS_DZE {type = "trade_any_vehicle";buy[] = {7000,"worth"};sell[] = {3000,"worth"};}; + class UralRefuel_CDF_DZE {type = "trade_any_vehicle";buy[] = {7000,"worth"};sell[] = {3000,"worth"};}; class V3S_Refuel_TK_GUE_EP1_DZ {type = "trade_any_vehicle";buy[] = {7000,"worth"};sell[] = {3000,"worth"};}; class KamazRefuel_DZ {type = "trade_any_vehicle";buy[] = {7000,"worth"};sell[] = {3000,"worth"};}; class MtvrRefuel_DES_EP1_DZ {type = "trade_any_vehicle";buy[] = {7000,"worth"};sell[] = {3000,"worth"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp index 07ffc05d7..fe2ad4e20 100644 --- a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Weapons.hpp @@ -84,7 +84,7 @@ class Category_13 { //Submachine Guns class Category_14 { - class Sa61_EP1 {type = "trade_weapons";buy[] = {100,"worth"};sell[] = {50,"worth"};}; + class Sa61_DZ {type = "trade_weapons";buy[] = {100,"worth"};sell[] = {50,"worth"};}; class Mac10_DZ {type = "trade_weapons";buy[] = {100,"worth"};sell[] = {50,"worth"};}; class TEC9_DZ {type = "trade_weapons";buy[] = {100,"worth"};sell[] = {50,"worth"};}; class PDW_DZ {type = "trade_weapons";buy[] = {400,"worth"};sell[] = {200,"worth"};}; @@ -440,7 +440,7 @@ class Category_16 { class Groza9_Sniper_SD_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {2000,"worth"};}; class VAL_DZ {type = "trade_weapons";buy[] = {3000,"worth"};sell[] = {1000,"worth"};}; class VAL_Kobra_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {1000,"worth"};}; - class VAL_POS1_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {1000,"worth"};}; + class VAL_PSO1_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {1000,"worth"};}; class AKS74U_DZ {type = "trade_weapons";buy[] = {200,"worth"};sell[] = {100,"worth"};}; class AKS74U_Kobra_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {300,"worth"};}; class AKS74U_SD_DZ {type = "trade_weapons";buy[] = {-1,"worth"};sell[] = {400,"worth"};}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Storage.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Storage.hpp index 65f5fab18..4aff01b63 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildables/Storage.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/Storage.hpp @@ -82,7 +82,7 @@ class StorageShed_DZ: Land_Shed_M01 armor = 1600; scope = 2; model = "\z\addons\dayz_epoch_v\base_building\storage\Shed_M02.p3d"; - offset[] = {0,4,1}; + offset[] = {0,4,0}; displayName = $STR_EPOCH_STORAGESHED; vehicleClass = "DayZ Epoch Buildables"; transportMaxMagazines = 400; @@ -97,7 +97,7 @@ class StorageShed2_DZ: Land_Shed_M01 { armor = 3200; scope = 2; - offset[] = {0,4,1}; + offset[] = {0,4,0}; displayName = $STR_EPOCH_STORAGESHED2; vehicleClass = "DayZ Epoch Buildables"; transportMaxMagazines = 600; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/UralCivil_DZ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/UralCivil_DZ.hpp index 96a760a7a..e0c3484ac 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/UralCivil_DZ.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/UralCivil_DZ.hpp @@ -541,7 +541,7 @@ class UralRefuel_TK_EP1_DZE4: UralRefuel_TK_EP1_DZE3 { }; class UralRefuel_CDF; -class UralRefuel_CDF_DZ: UralRefuel_CDF { +class UralRefuel_CDF_DZE: UralRefuel_CDF { scope = 2; displayName = "$STR_VEH_NAME_URAL_FUEL_CDF"; crew = ""; @@ -560,9 +560,9 @@ class UralRefuel_CDF_DZ: UralRefuel_CDF { ItemTruckORP[] = {"UralRefuel_CDF_DZE1",{"ItemToolbox","ItemCrowbar"},{},{{"ItemTruckORP",1},{"PartEngine",2},{"PartWheel",6},{"ItemScrews",2}}}; }; }; -class UralRefuel_CDF_DZE1: UralRefuel_CDF_DZ { +class UralRefuel_CDF_DZE1: UralRefuel_CDF_DZE { displayName = "$STR_VEH_NAME_URAL_FUEL_CDF+"; - original = "UralRefuel_CDF_DZ"; + original = "UralRefuel_CDF_DZE"; maxspeed = 100; //base 80 terrainCoef = 1.8; // base 2.0 turnCoef = 2.0; // base 3.7 @@ -712,7 +712,7 @@ class UralRepair_CDF_DZE4: UralRepair_CDF_DZE3 { }; class UralRefuel_INS; -class UralRefuel_INS_DZ: UralRefuel_INS { +class UralRefuel_INS_DZE: UralRefuel_INS { scope = 2; displayName = "$STR_VEH_NAME_URAL_FUEL_INS"; crew = ""; @@ -731,9 +731,9 @@ class UralRefuel_INS_DZ: UralRefuel_INS { ItemTruckORP[] = {"UralRefuel_INS_DZE1",{"ItemToolbox","ItemCrowbar"},{},{{"ItemTruckORP",1},{"PartEngine",2},{"PartWheel",6},{"ItemScrews",2}}}; }; }; -class UralRefuel_INS_DZE1: UralRefuel_INS_DZ { +class UralRefuel_INS_DZE1: UralRefuel_INS_DZE { displayName = "$STR_VEH_NAME_URAL_FUEL_INS+"; - original = "UralRefuel_INS_DZ"; + original = "UralRefuel_INS_DZE"; maxspeed = 100; //base 80 terrainCoef = 1.8; // base 2.0 turnCoef = 2.0; // base 3.7 diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/Pook.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/Pook.hpp index 6cb79c65c..5907ff731 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/Pook.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/Pook.hpp @@ -175,7 +175,7 @@ class pook_gunship_DZ: pook_H13_base_DZE memoryPointLRocket = "Rocket_1"; memoryPointRRocket = "Rocket_2"; selectionFireAnim = "zasleh"; - weapons[] = {"pook_M60_dual","pook_H13Grenades","CMFlareLauncher"}; + weapons[] = {"pook_M60_dual_DZ","pook_H13Grenades","CMFlareLauncher"}; magazines[] = {"pook_1300Rnd_762x51_M60","pook_12Rnd_Grenade_Camel","60Rnd_CMFlareMagazine","60Rnd_CMFlareMagazine"}; }; @@ -269,7 +269,10 @@ class pook_gunship_CDF_DZE3: pook_gunship_CDF_DZE2 fuelCapacity = 1000; }; -class pook_H13_transport; +class pook_H13_transport: pook_H13_base { + class Turrets; // External class reference + class MainTurret; // External class reference +}; class pook_transport_DZ: pook_H13_transport { scope = 2; @@ -295,8 +298,14 @@ class pook_transport_DZ: pook_H13_transport weapons[] = {"pook_H13Grenades","CMFlareLauncher"}; magazines[] = {"pook_12Rnd_Grenade_Camel","60Rnd_CMFlareMagazine","60Rnd_CMFlareMagazine"}; - class Turrets; // External class reference - class MainTurret; // External class reference + class Turrets: Turrets + { + class MainTurret: MainTurret + { + weapons[] = {"pook_M60_side_DZ","pook_H13Grenades"}; + //magazines[] = {"pook_250Rnd_762x51","pook_250Rnd_762x51","pook_250Rnd_762x51","pook_250Rnd_762x51","pook_250Rnd_762x51","pook_12Rnd_Grenade_Camel"}; + }; + }; }; class pook_transport_DZE: pook_transport_DZ @@ -615,4 +624,101 @@ class pook_H13_civ_yellow_DZE3: pook_H13_civ_yellow_DZE2 { displayName = "$STR_VEH_NAME_BELLH13_CIV_YELLOW+++"; fuelCapacity = 1000; +}; + +class pook_gunship_m134_DZ: pook_gunship_DZ +{ + displayName = "$STR_VEH_NAME_BELLH13_GUNSHIP"; + weapons[] = {"pook_M60_dual_m134_DZ","pook_H13Grenades","CMFlareLauncher"}; + magazines[] = {"2000Rnd_762x51_M134","pook_12Rnd_Grenade_Camel","60Rnd_CMFlareMagazine","60Rnd_CMFlareMagazine"}; +}; + +class pook_gunship_m134_DZE: pook_gunship_m134_DZ +{ + magazines[] = {"60Rnd_CMFlareMagazine","60Rnd_CMFlareMagazine"}; + + class Upgrades + { + ItemHeliAVE[] = {"pook_gunship_m134_DZE1",{"ItemToolbox","ItemSolder_DZE"},{},{{"ItemHeliAVE",1},{"equip_metal_sheet",5},{"ItemScrews",1},{"ItemTinBar",1},{"equip_scrapelectronics",2},{"equip_floppywire",2}}}; + }; +}; + +class pook_gunship_m134_DZE1: pook_gunship_m134_DZE +{ + displayName = "$STR_VEH_NAME_BELLH13_GUNSHIP+"; + original = "pook_gunship_m134_DZE"; + armor = 60; + damageResistance = 0.02078; + + class Upgrades + { + ItemHeliLRK[] = {"pook_gunship_m134_DZE2",{"ItemToolbox","ItemSolder_DZE"},{},{{"ItemHeliLRK",1},{"PartGeneric",2},{"ItemScrews",1},{"ItemWoodCrateKit",1},{"ItemGunRackKit",1},{"ItemTinBar",1},{"equip_scrapelectronics",2},{"equip_floppywire",2}}}; + }; +}; + +class pook_gunship_m134_DZE2: pook_gunship_m134_DZE1 +{ + displayName = "$STR_VEH_NAME_BELLH13_GUNSHIP++"; + transportMaxWeapons = 20; + transportMaxMagazines = 80; + transportmaxbackpacks = 8; + + class Upgrades + { + ItemHeliTNK[] = {"pook_gunship_m134_DZE3",{"ItemToolbox","ItemSolder_DZE"},{},{{"ItemHeliTNK",1},{"PartFueltank",2},{"PartGeneric",2},{"ItemFuelBarrel",1},{"ItemTinBar",1},{"equip_scrapelectronics",1},{"equip_floppywire",1}}}; + }; +}; + +class pook_gunship_m134_DZE3: pook_gunship_m134_DZE2 +{ + displayName = "$STR_VEH_NAME_BELLH13_GUNSHIP+++"; + fuelCapacity = 1000; +}; + +class pook_gunship_CDF_m134_DZ: pook_gunship_m134_DZ +{ + displayName = "$STR_VEH_NAME_BELLH13_GUNSHIP_GREEN"; + hiddenSelectionsTextures[] = {"\CA\air\Data\mi8_body_g_cdf_co.paa","ca\air\data\clear_empty.paa","ca\air\data\clear_empty.paa"}; +}; + +class pook_gunship_CDF_m134_DZE: pook_gunship_CDF_m134_DZ +{ + magazines[] = {"60Rnd_CMFlareMagazine","60Rnd_CMFlareMagazine"}; + + class Upgrades + { + ItemHeliAVE[] = {"pook_gunship_CDF_m134_DZE1",{"ItemToolbox","ItemSolder_DZE"},{},{{"ItemHeliAVE",1},{"equip_metal_sheet",5},{"ItemScrews",1},{"ItemTinBar",1},{"equip_scrapelectronics",2},{"equip_floppywire",2}}}; + }; +}; + +class pook_gunship_CDF_m134_DZE1: pook_gunship_CDF_m134_DZE +{ + displayName = "$STR_VEH_NAME_BELLH13_GUNSHIP_GREEN+"; + original = "pook_gunship_CDF_m134_DZE"; + armor = 60; + damageResistance = 0.02078; + + class Upgrades + { + ItemHeliLRK[] = {"pook_gunship_CDF_m134_DZE2",{"ItemToolbox","ItemSolder_DZE"},{},{{"ItemHeliLRK",1},{"PartGeneric",2},{"ItemScrews",1},{"ItemWoodCrateKit",1},{"ItemGunRackKit",1},{"ItemTinBar",1},{"equip_scrapelectronics",2},{"equip_floppywire",2}}}; + }; +}; + +class pook_gunship_CDF_m134_DZE2: pook_gunship_CDF_m134_DZE1 +{ + displayName = "$STR_VEH_NAME_BELLH13_GUNSHIP_GREEN++"; + transportMaxWeapons = 20; + transportMaxMagazines = 80; + transportmaxbackpacks = 8; + + class Upgrades + { + ItemHeliTNK[] = {"pook_gunship_CDF_m134_DZE3",{"ItemToolbox","ItemSolder_DZE"},{},{{"ItemHeliTNK",1},{"PartFueltank",2},{"PartGeneric",2},{"ItemFuelBarrel",1},{"ItemTinBar",1},{"equip_scrapelectronics",1},{"equip_floppywire",1}}}; + }; +}; + +class pook_gunship_CDF_m134_DZE3: pook_gunship_CDF_m134_DZE2 +{ + displayName = "$STR_VEH_NAME_BELLH13_GUNSHIP_GREEN+++"; + fuelCapacity = 1000; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index 2d0f0a61c..096a615f4 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -245,7 +245,8 @@ class CfgWeapons class UZI_SD_EP1; #include "Pistols\PDW.hpp" #include "Pistols\TEC9.hpp" - #include "Pistols\MAC10.hpp" + #include "Pistols\MAC10.hpp" + #include "Pistols\SA61.hpp" class revolver_EP1; #include "Pistols\Revolver.hpp" diff --git a/SQF/dayz_code/Configs/CfgWeapons/Pistols/SA61.hpp b/SQF/dayz_code/Configs/CfgWeapons/Pistols/SA61.hpp new file mode 100644 index 000000000..9018c8987 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Pistols/SA61.hpp @@ -0,0 +1,4 @@ +class Sa61_EP1; +class Sa61_DZ: Sa61_EP1 { + displayName = $STR_DZ_WPN_SA61_NAME; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK14.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK14.hpp index c825d732c..334e68e8f 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK14.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/MK14.hpp @@ -94,6 +94,11 @@ class MK14_CCO_DZ: MK14_DZ script = "; ['Attachment_CCO',_id,'MK14_DZ'] call player_removeAttachment"; }; }; + + class Attachments + { + Attachment_Sup762 = "MK14_CCO_SD_DZ"; + }; }; class MK14_Holo_DZ: MK14_DZ @@ -160,6 +165,8 @@ class MK14_Sniper_DZ: MK14_DZ weaponInfoType = "RscWeaponZeroing"; discreteDistance[] = {100,200,300,400,500,600,700,800}; discreteDistanceInitIndex = 2; + + class Attachments {}; }; class MK14_SD_DZ: M14_EP1 @@ -309,6 +316,8 @@ class MK14_Sniper_SD_DZ: MK14_SD_DZ weaponInfoType = "RscWeaponZeroing"; discreteDistance[] = {100,200,300,400,500,600,700,800}; discreteDistanceInitIndex = 2; + + class Attachments {}; class ItemActions {}; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/VehicleWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/VehicleWeapons.hpp index 15c4c38f9..76951f40c 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/VehicleWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/VehicleWeapons.hpp @@ -8,12 +8,78 @@ class AT5LauncherSingle: AT5Launcher }; class M240_veh; -class pook_M60_side: M240_veh +class pook_M60_side: M240_veh { + class manual; + class close; + class short; + class medium; + class far; +}; +class pook_M60_side_DZ: pook_M60_side { + displayName = $STR_DZ_WPN_SIDE_M60_NAME; + displayNameShort = $STR_DZ_WPN_SIDE_M60_NAME; magazines[] = {"pook_250Rnd_762x51","100Rnd_762x51_M240","200Rnd_762x51_M240","460Rnd_762x51_M240_ACR"}; + + class manual: manual { + displayName = $STR_DZ_WPN_SIDE_M60_NAME; + }; + class close: close { + displayName = $STR_DZ_WPN_SIDE_M60_NAME; + }; + class short: short { + displayName = $STR_DZ_WPN_SIDE_M60_NAME; + }; + class medium: medium { + displayName = $STR_DZ_WPN_SIDE_M60_NAME; + }; + class far: far { + displayName = $STR_DZ_WPN_SIDE_M60_NAME; + }; }; -class pook_M60_dual: pook_M60_side +class pook_M60_dual_DZ: pook_M60_side_DZ { + displayName = $STR_DZ_WPN_DUAL_M60_NAME; + displayNameShort = $STR_DZ_WPN_DUAL_M60_NAME; magazines[] = {"pook_1300Rnd_762x51_M60"}; + + class manual: manual { + displayName = $STR_DZ_WPN_DUAL_M60_NAME; + }; + class close: close { + displayName = $STR_DZ_WPN_DUAL_M60_NAME; + }; + class short: short { + displayName = $STR_DZ_WPN_DUAL_M60_NAME; + }; + class medium: medium { + displayName = $STR_DZ_WPN_DUAL_M60_NAME; + }; + class far: far { + displayName = $STR_DZ_WPN_DUAL_M60_NAME; + }; +}; + +class pook_M60_dual_m134_DZ: pook_M60_dual_DZ +{ + displayName = $STR_DZ_WPN_DUAL_M134_NAME; + displayNameShort = $STR_DZ_WPN_DUAL_M134_NAME; + magazines[] = {"2000Rnd_762x51_M134","4000Rnd_762x51_M134"}; + + class manual: manual { + displayName = $STR_DZ_WPN_DUAL_M134_NAME; + }; + class close: close { + displayName = $STR_DZ_WPN_DUAL_M134_NAME; + }; + class short: short { + displayName = $STR_DZ_WPN_DUAL_M134_NAME; + }; + class medium: medium { + displayName = $STR_DZ_WPN_DUAL_M134_NAME; + }; + class far: far { + displayName = $STR_DZ_WPN_DUAL_M134_NAME; + }; }; \ No newline at end of file diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 1de21cd1b..7f6c0515a 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -3,7 +3,7 @@ Dayz_plants = ["Dayz_Plant1","Dayz_Plant2","Dayz_Plant3"]; DayZ_SafeObjects = ["Base_Fire_DZ","Land_Fire_DZ","TentStorage","TentStorage0","TentStorage1","TentStorage2","TentStorage3","TentStorage4","StashSmall","StashSmall1","StashSmall2","StashSmall3","StashSmall4","StashMedium","StashMedium1","StashMedium2","StashMedium3","StashMedium4","Wire_cat1","Sandbag1_DZ","Fence_DZ","Generator_DZ","Hedgehog_DZ","BearTrap_DZ","DomeTentStorage","DomeTentStorage0","DomeTentStorage1","DomeTentStorage2","DomeTentStorage3","DomeTentStorage4","CamoNet_DZ","Trap_Cans","TrapTripwireFlare","TrapBearTrapSmoke","TrapTripwireGrenade","TrapTripwireSmoke","TrapBearTrapFlare","TentStorageDomed","VaultStorageLocked","VaultStorage2Locked","BagFenceRound_DZ","TrapBear","Fort_RazorWire","Land_HBarrier1_DZ","Land_HBarrier3_DZ","Land_HBarrier5_DZ","Fence_corrugated_DZ","M240Nest_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","OutHouse_DZ","Wooden_shed_DZ","Wooden_shed2_DZ","WoodShack_DZ","WoodShack2_DZ","StorageShed_DZ","StorageShed2_DZ","Plastic_Pole_EP1_DZ","StickFence_DZ","LightPole_DZ","FuelPump_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","WinterCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","WinterLargeCamoNet_DZ","SandNest_DZ","DeerStand_DZ","MetalPanel_DZ","WorkBench_DZ","WoodFloor_DZ","WoodLargeWall_DZ","WoodLargeWallDoor_DZ","WoodLargeWallWin_DZ","WoodSmallWall_DZ","WoodSmallWallWin_DZ","WoodSmallWallDoor_DZ","LockboxStorageLocked","LockboxStorage2Locked","LockboxStorageWinterLocked","LockboxStorageWinter2Locked","WoodFloorHalf_DZ","WoodFloorQuarter_DZ","WoodStairs_DZ","WoodStairsSans_DZ","WoodStairsRails_DZ","WoodSmallWallThird_DZ","WoodLadder_DZ","Land_DZE_GarageWoodDoor","Land_DZE_LargeWoodDoor","Land_DZE_WoodDoor","Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked","Land_DZE_WoodDoorLocked","CinderWallHalf_DZ","CinderWall_DZ","CinderWallDoorway_DZ","CinderWallDoor_DZ","CinderWallDoorLocked_DZ","CinderWallSmallDoorway_DZ","CinderWallDoorSmall_DZ","CinderWallDoorSmallLocked_DZ","MetalFloor_DZ","WoodRamp_DZ","GunRack_DZ","GunRack2_DZ","FireBarrel_DZ","WoodCrate_DZ","WoodCrate2_DZ","Scaffolding_DZ","DesertTentStorage","DesertTentStorage0","DesertTentStorage1","DesertTentStorage2","DesertTentStorage3","DesertTentStorage4","WoodenFence_1_foundation_DZ","WoodenFence_1_frame_DZ","WoodenFence_quaterpanel_DZ","WoodenFence_halfpanel_DZ","WoodenFence_thirdpanel_DZ","WoodenFence_1_DZ","WoodenFence_2_DZ","WoodenFence_3_DZ","WoodenFence_4_DZ","WoodenFence_5_DZ","WoodenFence_6_DZ","WoodenFence_7_DZ","MetalFence_1_foundation_DZ","MetalFence_1_frame_DZ","MetalFence_halfpanel_DZ","MetalFence_thirdpanel_DZ","MetalFence_1_DZ","MetalFence_2_DZ","MetalFence_3_DZ","MetalFence_4_DZ","MetalFence_5_DZ","MetalFence_6_DZ","MetalFence_7_DZ","WoodenGate_foundation_DZ","WoodenGate_1_DZ","WoodenGate_2_DZ","WoodenGate_3_DZ","WoodenGate_4_DZ","WoodGateFrame_DZ","Land_DZE_WoodGate","Land_DZE_WoodGateLocked","CinderGateFrame_DZ","CinderGate_DZ","CinderGateLocked_DZ","Metal_Drawbridge_DZ","Metal_DrawbridgeLocked_DZ","WoodTriangleWall_DZ","WoodHandrail_DZ","WoodFloorStairs_DZ","WoodPillar_DZ","Land_DZE_WoodOpenTopGarageDoor","Land_DZE_WoodOpenTopGarageLocked","CinderGarageOpenTopFrame_DZ","CinderGarageOpenTop_DZ","CinderGarageOpenTopLocked_DZ","DoorFrame_DZ","Door_DZ","DoorLocked_DZ","CinderWallWindow_DZ","CinderWallWindowLocked_DZ","CinderDoorHatch_DZ","CinderDoorHatchLocked_DZ","MetalPillar_DZ","MetalFloor_Half_DZ","MetalFloor_Quarter_DZ","GlassFloor_DZ","Concrete_Bunker_DZ","Concrete_Bunker_Locked_DZ","TallSafeLocked","Advanced_WorkBench_DZ","CookTripod_DZ","Stoneoven_DZ","Commode_DZ","Wardrobe_DZ","Fridge_DZ","Washing_Machine_DZ","Server_Rack_DZ","ATM_DZ","Armchair_DZ","Sofa_DZ","Arcade_DZ","Vendmachine1_DZ","Vendmachine2_DZ","Notebook_DZ","Water_Pump_DZ","Greenhouse_DZ","Bed_DZ","Table_DZ","Office_Chair_DZ","MetalFloor4x_DZ","GlassFloor_Half_DZ","GlassFloor_Quarter_DZ","WoodFloor4x_DZ","WoodTriangleFloor_DZ","CinderWallHalf_Gap_DZ","TentStorageWinter","TentStorageWinter0","TentStorageWinter1","TentStorageWinter2","TentStorageWinter3","TentStorageWinter4","WinterDomeTentStorage","WinterDomeTentStorage0","WinterDomeTentStorage1","WinterDomeTentStorage2","WinterDomeTentStorage3","WinterDomeTentStorage4","VaultStorageBroken","VaultStorageBroken2","TallSafeBroken","LockboxStorageBroken","LockboxStorage2Broken","LockboxStorageWinterBroken","LockboxStorageWinter2Broken","StorageCrate_DZ","CamoStorageCrate_DZ"]; DayZ_GearedObjects = ["Car","Helicopter","Motorcycle","Ship","TentStorage_base","StashSmall_base","StashMedium_base","Plane","Tank","VaultStorage","VaultStorage2","LockboxStorage","LockboxStorage2","LockboxStorageWinter","LockboxStorageWinter2","TentStorage","OutHouse_DZ","Wooden_shed_DZ","Wooden_shed2_DZ","WoodShack_DZ","WoodShack2_DZ","StorageShed_DZ","StorageShed2_DZ","GunRack_DZ","GunRack2_DZ","WoodCrate_DZ","WoodCrate2_DZ","Scaffolding_DZ","Generator_DZ","Advanced_WorkBench_DZ","CookTripod_DZ","Stoneoven_DZ","Commode_DZ","Wardrobe_DZ","Fridge_DZ","Washing_Machine_DZ","Server_Rack_DZ","ATM_DZ","Armchair_DZ","Sofa_DZ","Arcade_DZ","Vendmachine1_DZ","Vendmachine2_DZ","VaultStorageBroken","VaultStorageBroken2","TallSafeBroken","LockboxStorageBroken","LockboxStorage2Broken","LockboxStorageWinterBroken","LockboxStorageWinter2Broken","StorageCrate_DZ","CamoStorageCrate_DZ"]; -dayz_typedBags = ["emptyBloodBag","bloodTester","bloodBagANEG","bloodBagAPOS","bloodBagBNEG","bloodBagBPOS","bloodBagABNEG","bloodBagABPOS","bloodBagONEG","bloodBagOPOS","wholeBloodBagANEG","wholeBloodBagAPOS","wholeBloodBagBNEG","wholeBloodBagBPOS","wholeBloodBagABNEG","wholeBloodBagABPOS","wholeBloodBagONEG","wholeBloodBagOPOS"]; +dayz_typedBags = ["bloodTester","bloodBagANEG","bloodBagAPOS","bloodBagBNEG","bloodBagBPOS","bloodBagABNEG","bloodBagABPOS","bloodBagONEG","bloodBagOPOS","wholeBloodBagANEG","wholeBloodBagAPOS","wholeBloodBagBNEG","wholeBloodBagBPOS","wholeBloodBagABNEG","wholeBloodBagABPOS","wholeBloodBagONEG","wholeBloodBagOPOS"]; dayz_plant = ["pumpkin.p3d","p_helianthus.p3d","p_fiberplant_ep1.p3d"]; dayz_trees = ["ind_timbers.p3d","t_picea2s_snow.p3d","b_corylus.p3d","t_quercus3s.p3d","t_larix3s.p3d","t_pyrus2s.p3d","str_briza_kriva.p3d","dd_borovice.p3d","les_singlestrom_b.p3d","les_singlestrom.p3d","smrk_velky.p3d","smrk_siroky.p3d","smrk_maly.p3d","les_buk.p3d","str krovisko vysoke.p3d","str_fikovnik_ker.p3d","str_fikovnik.p3d","str vrba.p3d","hrusen2.p3d","str dub jiny.p3d","str lipa.p3d","str briza.p3d","p_akat02s.p3d","jablon.p3d","p_buk.p3d","str_topol.p3d","str_topol2.p3d","p_osika.p3d","t_picea3f.p3d","t_picea2s.p3d","t_picea1s.p3d","t_fagus2w.p3d","t_fagus2s.p3d","t_fagus2f.p3d","t_betula1f.p3d","t_betula2f.p3d","t_betula2s.p3d","t_betula2w.p3d","t_alnus2s.p3d","t_acer2s.p3d","t_populus3s.p3d","t_quercus2f.p3d","t_sorbus2s.p3d","t_malus1s.p3d","t_salix2s.p3d","t_picea1s_w.p3d","t_picea2s_w.p3d","t_ficusb2s_ep1.p3d","t_populusb2s_ep1.p3d","t_populusf2s_ep1.p3d","t_amygdalusc2s_ep1.p3d","t_pistacial2s_ep1.p3d","t_pinuse2s_ep1.p3d","t_pinuss3s_ep1.p3d","t_prunuss2s_ep1.p3d","t_pinusn2s.p3d","t_pinusn1s.p3d","t_pinuss2f.p3d","t_poplar2f_dead_pmc.p3d","misc_torzotree_pmc.p3d","misc_burnspruce_pmc.p3d","brg_cocunutpalm8.p3d","brg_umbrella_acacia01b.p3d","brg_jungle_tree_canopy_1.p3d","brg_jungle_tree_canopy_2.p3d","brg_cocunutpalm4.p3d","brg_cocunutpalm3.p3d","palm_01.p3d","palm_02.p3d","palm_03.p3d","palm_04.p3d","palm_09.p3d","palm_10.p3d","brg_cocunutpalm2.p3d","brg_jungle_tree_antiaris.p3d","brg_cocunutpalm1.p3d","str habr.p3d","brg_bird_1.p3d","brg_bird_2.p3d","brg_bird_3.p3d","brg_umbrella_acacia02b.p3d","brg_africandoumpalm_1.p3d","brg_umbrella_acacia04b.p3d","brg_datepalm_4.p3d","brg_datepalm_1.p3d","brg_umbrella_acacia03b.p3d","brg_bottle_4.p3d","brg_aloe1.p3d","brg_umbrella_acacia03.p3d","brg_umbrella_acacia01.p3d","brg_umbrella_acacia04.p3d","brg_aloe2.p3d","brg_umbrella_acacia02.p3d","brg_aloe3.p3d","brg_bottle_1.p3d","brg_datepalm_3.p3d","brg_datepalm_2.p3d","brg_baobab_1.p3d","brg_bottle_2.p3d","brg_bottle_3.p3d","t_fraxinus2s.p3d","t_carpinus2s.p3d"]; dayZ_explosiveParts = ["palivo","motor"]; @@ -281,7 +281,7 @@ if (!isDedicated) then { DZE_REPLACE_WEAPONS = [["Crossbow","DMR","M14_EP1","SVD","SVD_CAMO","M4SPR","VSS_vintorez"],["Crossbow_DZ","DMR_DZ","M14_CCO_DZ","SVD_PSO1_DZ","SVD_PSO1_Gh_DZ","M4SPR_DZE","VSS_vintorez_DZE"]]; DZE_replaceMagazines = [["vil_20Rnd_762x51_G3"],["vil_20Rnd_762x51_G3"]]; DZE_maintainClasses = ["ModularItems","DZE_Housebase","LightPole_DZ","BuiltItems","Generator_DZ","DZ_buildables","Plastic_Pole_EP1_DZ","Fence_corrugated_DZ","CanvasHut_DZ","ParkBench_DZ","MetalGate_DZ","StickFence_DZ","DesertCamoNet_DZ","ForestCamoNet_DZ","WinterCamoNet_DZ","DesertLargeCamoNet_DZ","ForestLargeCamoNet_DZ","WinterLargeCamoNet_DZ","DeerStand_DZ","Scaffolding_DZ","FireBarrel_DZ","M240Nest_DZ","Notebook_DZ","Water_Pump_DZ","Greenhouse_DZ","Bed_DZ","Table_DZ","VaultStorageBroken","VaultStorageBroken2","TallSafeBroken","LockboxStorageBroken","LockboxStorage2Broken","LockboxStorageWinterBroken","LockboxStorageWinter2Broken"]; - DZE_fueltruckarray = ["UralRefuel_TK_EP1_DZ","UralRefuel_TK_EP1_DZE1","UralRefuel_TK_EP1_DZE2","UralRefuel_TK_EP1_DZE3","UralRefuel_TK_EP1_DZE4","MtvrRefuel_DES_EP1_DZ","MtvrRefuel_DES_EP1_DZE1","MtvrRefuel_DES_EP1_DZE2","MtvrRefuel_DES_EP1_DZE3","MtvrRefuel_DES_EP1_DZE4","V3S_Refuel_TK_GUE_EP1_DZ","V3S_Refuel_TK_GUE_EP1_DZE1","V3S_Refuel_TK_GUE_EP1_DZE2","V3S_Refuel_TK_GUE_EP1_DZE3","V3S_Refuel_TK_GUE_EP1_DZE4","MtvrRefuel_DZ","MtvrRefuel_DZE1","MtvrRefuel_DZE2","MtvrRefuel_DZE3","MtvrRefuel_DZE4","KamazRefuel_DZ","KamazRefuel_DZE1","KamazRefuel_DZE2","KamazRefuel_DZE3","KamazRefuel_DZE4","T810A_ACR_REFUEL_DES_DZE","T810A_ACR_REFUEL_DES_DZE1","T810A_ACR_REFUEL_DES_DZE2","T810A_ACR_REFUEL_DES_DZE3","T810A_ACR_REFUEL_DES_DZE4","T810A_ACR_REFUEL_DZE","T810A_ACR_REFUEL_DZE1","T810A_ACR_REFUEL_DZE2","T810A_ACR_REFUEL_DZE3","T810A_ACR_REFUEL_DZE4"]; + DZE_fueltruckarray = ["UralRefuel_TK_EP1_DZ","UralRefuel_TK_EP1_DZE1","UralRefuel_TK_EP1_DZE2","UralRefuel_TK_EP1_DZE3","UralRefuel_TK_EP1_DZE4","MtvrRefuel_DES_EP1_DZ","MtvrRefuel_DES_EP1_DZE1","MtvrRefuel_DES_EP1_DZE2","MtvrRefuel_DES_EP1_DZE3","MtvrRefuel_DES_EP1_DZE4","V3S_Refuel_TK_GUE_EP1_DZ","V3S_Refuel_TK_GUE_EP1_DZE1","V3S_Refuel_TK_GUE_EP1_DZE2","V3S_Refuel_TK_GUE_EP1_DZE3","V3S_Refuel_TK_GUE_EP1_DZE4","MtvrRefuel_DZ","MtvrRefuel_DZE1","MtvrRefuel_DZE2","MtvrRefuel_DZE3","MtvrRefuel_DZE4","KamazRefuel_DZ","KamazRefuel_DZE1","KamazRefuel_DZE2","KamazRefuel_DZE3","KamazRefuel_DZE4","T810A_ACR_REFUEL_DES_DZE","T810A_ACR_REFUEL_DES_DZE1","T810A_ACR_REFUEL_DES_DZE2","T810A_ACR_REFUEL_DES_DZE3","T810A_ACR_REFUEL_DES_DZE4","T810A_ACR_REFUEL_DZE","T810A_ACR_REFUEL_DZE1","T810A_ACR_REFUEL_DZE2","T810A_ACR_REFUEL_DZE3","T810A_ACR_REFUEL_DZE4","UralRefuel_INS_DZE","UralRefuel_INS_DZE1","UralRefuel_INS_DZE2","UralRefuel_INS_DZE3","UralRefuel_INS_DZE4","UralRefuel_CDF_DZE","UralRefuel_CDF_DZE1","UralRefuel_CDF_DZE2","UralRefuel_CDF_DZE3","UralRefuel_CDF_DZE4"]; DZE_HeliAllowToTow = ["hilux1_civil_1_open","HMMWV_Base","Lada_base","Offroad_DSHKM_base","Pickup_PK_base","SkodaBase","tractor","VWGolf","Volha_TK_CIV_Base_EP1","S1203_TK_CIV_EP1","SUV_Base_EP1","ArmoredSUV_Base_PMC","UAZ_Base","LandRover_Base","Ship"]; DZE_isDestroyableStorage = ["OutHouse_DZ","Wooden_shed_DZ","Wooden_shed2_DZ","WoodShack_DZ","WoodShack2_DZ","StorageShed_DZ","StorageShed2_DZ","GunRack_DZ","GunRack2_DZ","WoodCrate_DZ","WoodCrate2_DZ","Advanced_WorkBench_DZ","CookTripod_DZ","Stoneoven_DZ","Commode_DZ","Wardrobe_DZ","Fridge_DZ","Washing_Machine_DZ","Server_Rack_DZ","ATM_DZ","Armchair_DZ","Sofa_DZ","Arcade_DZ","Vendmachine1_DZ","Vendmachine2_DZ","StorageCrate_DZ","CamoStorageCrate_DZ"]; DZE_tradeVehicle = ["trade_any_vehicle","trade_any_vehicle_free","trade_any_vehicle_old","trade_any_bicycle","trade_any_bicycle_old","trade_any_boat","trade_any_boat_old"]; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 356f5f20f..b2a06d2a3 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -18892,7 +18892,23 @@ Revolver <br/>Kaliber: .45 ACP Револьвер <br/>Патрон: .45 ACP - + + + Sa-61 Škorpión + + + + M60 + + + Twin M60 + Zwillings-M60 + + + Twin M134 + Zwillings-M134 + + @@ -20750,45 +20766,45 @@ 2000п. M134 - Caliber: 7.62x51mm<br/>Rounds: 2000<br/>Used in: M134, Twin M60 - Calibre: 7.62x51mm<br/>Munitions : 2000<br/>Utilisé avec: M134, Twin M60 - Calibre: 7.62x51mm<br/>Cartuchos: 2000<br/>Usado en: M134, Twin M60 - Calibro: 7.62x51mm<br/>Munizioni: 2000<br/>Usato in: M134, Twin M60 - Kaliber: 7.62x51mm<br/>Naboje: 2000<br/>Uzywany w: M134, Twin M60 - Патрон: 7.62x51мм <br/>Количество: 2000<br/>Исп. в: M134, Twin M60 - Kaliber: 7.62x51mm<br/>Patronen: 2000<br/>Verwendet in: M134, Twin M60 - Kalibr: 7.62x51mm<br/>Nábojů: 2000<br/>Pro: M134, Twin M60 - Kaliber: 7.62x51mm<br/> Töltények: 2000<br/> Hozzá tartozó fegyver: M134, Twin M60 + Caliber: 7.62x51mm<br/>Rounds: 2000<br/>Used in: M134, Twin M134 + Calibre: 7.62x51mm<br/>Munitions : 2000<br/>Utilisé avec: M134, Twin M134 + Calibre: 7.62x51mm<br/>Cartuchos: 2000<br/>Usado en: M134, Twin M134 + Calibro: 7.62x51mm<br/>Munizioni: 2000<br/>Usato in: M134, Twin M134 + Kaliber: 7.62x51mm<br/>Naboje: 2000<br/>Uzywany w: M134, Twin M134 + Патрон: 7.62x51мм <br/>Количество: 2000<br/>Исп. в: M134, Twin M134 + Kaliber: 7.62x51mm<br/>Patronen: 2000<br/>Verwendet in: M134, Zwillings-M134 + Kalibr: 7.62x51mm<br/>Nábojů: 2000<br/>Pro: M134, Twin M134 + Kaliber: 7.62x51mm<br/> Töltények: 2000<br/> Hozzá tartozó fegyver: M134, Twin M134 4000Rnd. M134 4000п. M134 - Caliber: 7.62x51mm<br/>Rounds: 4000<br/>Used in: M134 - Calibre: 7.62x51mm<br/>Munitions : 4000<br/>Utilisé avec: M134 - Calibre: 7.62x51mm<br/>Cartuchos: 4000<br/>Usado en: M134 - Calibro: 7.62x51mm<br/>Munizioni: 4000<br/>Usato in: M134 - Kaliber: 7.62x51mm<br/>Naboje: 4000<br/>Uzywany w: M134 - Патрон: 7.62x51мм <br/>Количество: 4000<br/>Исп. в: M134 - Kaliber: 7.62x51mm<br/>Patronen: 4000<br/>Verwendet in: M134 - Kalibr: 7.62x51mm<br/>Nábojů: 4000<br/>Pro: M134 - Kaliber: 7.62x51mm<br/> Töltények: 4000<br/> Hozzá tartozó fegyver: M134 + Caliber: 7.62x51mm<br/>Rounds: 4000<br/>Used in: M134, Twin M134 + Calibre: 7.62x51mm<br/>Munitions : 4000<br/>Utilisé avec: M134, Twin M134 + Calibre: 7.62x51mm<br/>Cartuchos: 4000<br/>Usado en: M134, Twin M134 + Calibro: 7.62x51mm<br/>Munizioni: 4000<br/>Usato in: M134, Twin M134 + Kaliber: 7.62x51mm<br/>Naboje: 4000<br/>Uzywany w: M134, Twin M134 + Патрон: 7.62x51мм <br/>Количество: 4000<br/>Исп. в: M134, Twin M134 + Kaliber: 7.62x51mm<br/>Patronen: 4000<br/>Verwendet in: M134, Zwillings-M134 + Kalibr: 7.62x51mm<br/>Nábojů: 4000<br/>Pro: M134, Twin M134 + Kaliber: 7.62x51mm<br/> Töltények: 4000<br/> Hozzá tartozó fegyver: M134, Twin M134 2000Rnd. L94A1 2000п. L94A1 - Caliber: 7.62x51mm<br/>Rounds: 2000<br/>Used in: L94A1, Twin M60 - Calibre: 7.62x51mm<br/>Munitions : 2000<br/>Utilisé avec: L94A1, Twin M60 - Calibre: 7.62x51mm<br/>Cartuchos: 2000<br/>Usado en: L94A1, Twin M60 - Calibro: 7.62x51mm<br/>Munizioni: 2000<br/>Usato in: L94A1, Twin M60 - Kaliber: 7.62x51mm<br/>Naboje: 2000<br/>Uzywany w: L94A1, Twin M60 - Патрон: 7.62x51мм <br/>Количество: 2000<br/>Исп. в: L94A1, Twin M60 - Kaliber: 7.62x51mm<br/>Patronen: 2000<br/>Verwendet in: L94A1, Twin M60 - Kalibr: 7.62x51mm<br/>Nábojů: 2000<br/>Pro: L94A1, Twin M60 - Kaliber: 7.62x51mm<br/> Töltények: 2000<br/> Hozzá tartozó fegyver: L94A1, Twin M60 + Caliber: 7.62x51mm<br/>Rounds: 2000<br/>Used in: L94A1 + Calibre: 7.62x51mm<br/>Munitions : 2000<br/>Utilisé avec: L94A1 + Calibre: 7.62x51mm<br/>Cartuchos: 2000<br/>Usado en: L94A1 + Calibro: 7.62x51mm<br/>Munizioni: 2000<br/>Usato in: L94A1 + Kaliber: 7.62x51mm<br/>Naboje: 2000<br/>Uzywany w: L94A1 + Патрон: 7.62x51мм <br/>Количество: 2000<br/>Исп. в: L94A1 + Kaliber: 7.62x51mm<br/>Patronen: 2000<br/>Verwendet in: L94A1 + Kalibr: 7.62x51mm<br/>Nábojů: 2000<br/>Pro: L94A1 + Kaliber: 7.62x51mm<br/> Töltények: 2000<br/> Hozzá tartozó fegyver: L94A1 100Rnd. M2 @@ -20876,7 +20892,7 @@ Calibro: 7.62x51mm<br/>Munizioni: 1300<br/>Usato in: Twin M60 Kaliber: 7.62x51mm<br/>Naboje: 1300<br/>Uzywany w: Twin M60 Патрон: 7.62x51мм <br/>Количество: 1300<br/>Исп. в: Twin M60 - Kaliber: 7.62x51mm<br/>Patronen: 1300<br/>Verwendet in: Twin M60 + Kaliber: 7.62x51mm<br/>Patronen: 1300<br/>Verwendet in: Zwillings-M60 Kalibr: 7.62x51mm<br/>Nábojů: 1300<br/>Pro: Twin M60 Kaliber: 7.62x51mm<br/> Töltények: 1300<br/> Hozzá tartozó fegyver: Twin M60