diff --git a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgLootSmall.hpp b/SQF/dayz_code/Configs/CfgBuildingLoot/CfgLootSmall.hpp deleted file mode 100644 index 85e664b93..000000000 --- a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgLootSmall.hpp +++ /dev/null @@ -1,272 +0,0 @@ -class CfgLootSmall { - trash[] = { - {"TrashTinCan",0.5} - ,{"TrashJackDaniels",0.05} - ,{"ItemSodaEmpty",0.25} - ,{"ItemTrashToiletpaper",0.1} - ,{"ItemTrashRazor",0.1} - }; - civilian[] = { - {"FoodCanUnlabeled",0.07} - ,{"TrashJackDaniels",0.09} - ,{"ItemSodaEmpty",0.09} - ,{"ItemSodaCoke",0.1} - ,{"ItemSodaPepsi",0.09} - ,{"FoodCanBakedBeans",0.05} - ,{"FoodCanSardines",0.05} - ,{"FoodCanFrankBeans",0.05} - ,{"FoodCanPasta",0.05} - ,{"8Rnd_9x18_Makarov",0.07} - ,{"7Rnd_45ACP_1911",0.05} - ,{"2Rnd_shotgun_74Slug",0.05} - ,{"2Rnd_shotgun_74Pellets",0.05} - ,{"ItemBandage",0.06} - ,{"ItemPainkiller",0.06} - ,{"FoodBioMeat",0.01} - ,{"8Rnd_9x18_MakarovSD",0.01} - }; - office2[] = { - {"FoodCanUnlabeled",0.07} - ,{"TrashJackDaniels",0.09} - ,{"ItemSodaEmpty",0.09} - ,{"ItemSodaCoke",0.09} - ,{"ItemSodaPepsi",0.09} - ,{"FoodCanBakedBeans",0.05} - ,{"FoodCanSardines",0.05} - ,{"FoodCanFrankBeans",0.05} - ,{"FoodCanPasta",0.05} - ,{"8Rnd_9x18_Makarov",0.07} - ,{"7Rnd_45ACP_1911",0.05} - ,{"2Rnd_shotgun_74Slug",0.05} - ,{"2Rnd_shotgun_74Pellets",0.05} - ,{"ItemBandage",0.06} - ,{"ItemPainkiller",0.06} - ,{"FoodBioMeat",0.01} - ,{"8Rnd_9x18_MakarovSD",0.01} - }; - food[] = { - {"TrashTinCan",0.09} - ,{"TrashJackDaniels",0.12} - ,{"ItemSodaEmpty",0.12} - ,{"ItemSodaCoke",0.09} - ,{"ItemSodaPepsi",0.11} - ,{"FoodCanBakedBeans",0.07} - ,{"FoodCanSardines",0.07} - ,{"FoodCanFrankBeans",0.07} - ,{"FoodCanPasta",0.07} - ,{"FoodCanUnlabeled",0.1} - ,{"FoodPistachio",0.05} - ,{"FoodNutmix",0.04} - }; - office[] = { - {"FoodCanUnlabeled",0.06} - ,{"ItemSodaEmpty",0.06} - ,{"ItemSodaCoke",0.06} - ,{"ItemSodaPepsi",0.04} - ,{"TrashJackDaniels",0.04} - ,{"FoodCanBakedBeans",0.01} - ,{"FoodCanSardines",0.01} - ,{"FoodCanFrankBeans",0.01} - ,{"FoodCanPasta",0.01} - ,{"ItemWaterbottleUnfilled",0.01} - ,{"ItemWaterbottle",0.01} - ,{"ItemBandage",0.08} - ,{"7Rnd_45ACP_1911",0.03} - ,{"5x_22_LR_17_HMR",0.01} - ,{"10x_303",0.04} - ,{"6Rnd_45ACP",0.04} - ,{"2Rnd_shotgun_74Slug",0.05} - ,{"2Rnd_shotgun_74Pellets",0.05} - ,{"8Rnd_9x18_Makarov",0.09} - ,{"15Rnd_W1866_Slug",0.02} - ,{"WoodenArrow",0.04} - ,{"HandRoadFlare",0.07} - ,{"ItemPainkiller",0.02} - ,{"HandChemGreen",0.01} - ,{"HandChemBlue",0.03} - ,{"HandChemRed",0.03} - ,{"ItemHeatPack",0.03} - }; - generic[] = { - {"FoodCanUnlabeled",0.06} - ,{"ItemSodaEmpty",0.06} - ,{"ItemSodaCoke",0.06} - ,{"ItemSodaPepsi",0.04} - ,{"TrashJackDaniels",0.04} - ,{"FoodCanBakedBeans",0.01} - ,{"FoodCanSardines",0.01} - ,{"FoodCanFrankBeans",0.01} - ,{"FoodCanPasta",0.01} - ,{"ItemWaterbottleUnfilled",0.01} - ,{"ItemWaterbottle",0.01} - ,{"ItemBandage",0.11} - ,{"7Rnd_45ACP_1911",0.03} - ,{"5x_22_LR_17_HMR",0.01} - ,{"10x_303",0.04} - ,{"6Rnd_45ACP",0.04} - ,{"2Rnd_shotgun_74Slug",0.05} - ,{"2Rnd_shotgun_74Pellets",0.05} - ,{"8Rnd_9x18_Makarov",0.09} - ,{"15Rnd_W1866_Slug",0.02} - ,{"WoodenArrow",0.04} - ,{"HandRoadFlare",0.07} - ,{"ItemPainkiller",0.02} - ,{"HandChemGreen",0.01} - ,{"HandChemBlue",0.03} - ,{"HandChemRed",0.03} - ,{"ItemHeatPack",0.04} - }; - medical[] = { - {"ItemBandage",0.4} - ,{"ItemPainkiller",0.15} - ,{"ItemMorphine",0.2} - ,{"ItemEpinephrine",0.1} - ,{"ItemAntibiotic",0.1} - ,{"ItemHeatPack",0.05} - }; - hospital[] = { - {"ItemBandage",0.33} - ,{"ItemPainkiller",0.16} - ,{"ItemMorphine",0.13} - ,{"ItemEpinephrine",0.09} - ,{"ItemBloodbag",0.17} - ,{"ItemAntibiotic",0.12} - }; - military[] = { - {"FoodCanUnlabeled",0.09} - ,{"ItemSodaEmpty",0.04} - ,{"ItemSodaCoke",0.01} - ,{"ItemSodaPepsi",0.01} - ,{"ItemBandage",0.04} - ,{"ItemAntibiotic",0.04} - ,{"ItemPainkiller",0.04} - ,{"ItemMorphine",0.01} - ,{"30Rnd_556x45_Stanag",0.04} - ,{"20Rnd_762x51_DMR",0.04} - ,{"17Rnd_9x19_glock17",0.05} - ,{"15Rnd_9x19_M9SD",0.01} - ,{"15Rnd_9x19_M9",0.02} - ,{"30Rnd_762x39_AK47",0.04} - ,{"30Rnd_545x39_AK",0.04} - ,{"5Rnd_762x51_M24",0.01} - ,{"5Rnd_86x70_L115A1",0.01} - ,{"8Rnd_B_Beneli_74Slug",0.04} - ,{"1Rnd_HE_M203",0.01} - ,{"FlareWhite_M203",0.01} - ,{"FlareGreen_M203",0.01} - ,{"1Rnd_Smoke_M203",0.01} - ,{"200Rnd_556x45_M249",0.01} - ,{"HandGrenade_west",0.01} - ,{"HandGrenade_east",0.01} - ,{"SmokeShell",0.04} - ,{"SmokeShellRed",0.02} - ,{"SmokeShellGreen",0.02} - ,{"8Rnd_B_Beneli_Pellets",0.04} - ,{"30Rnd_556x45_StanagSD",0.01} - ,{"30Rnd_9x19_MP5",0.02} - ,{"30Rnd_9x19_MP5SD",0.01} - ,{"100Rnd_762x51_M240",0.01} - ,{"HandChemGreen",0.02} - ,{"HandChemBlue",0.02} - ,{"HandChemRed",0.02} - ,{"ItemHeatPack",0.04} - ,{"8Rnd_9x18_MakarovSD",0.01} - ,{"20Rnd_B_765x17_Ball",0.04} - ,{"30Rnd_9x19_UZI_SD",0.01} - }; - policeman[] = { - {"ItemBandage",0.3} - ,{"7Rnd_45ACP_1911",0.08} - ,{"6Rnd_45ACP",0.08} - ,{"15Rnd_W1866_Slug",0.14} - ,{"8Rnd_B_Beneli_Pellets",0.17} - ,{"HandRoadFlare",0.08} - ,{"8Rnd_9x18_MakarovSD",0.01} - ,{"ItemComboLock",0.05} - ,{"SmokeShell",0.04} - ,{"ItemHotwireKit",0.01} - }; - hunter[] = { - {"FoodMRE",0.01} - }; - worker[] = { - {"FoodCanUnlabeled",0.09} - ,{"TrashJackDaniels",0.1} - ,{"ItemSodaEmpty",0.1} - ,{"ItemSodaCoke",0.11} - ,{"ItemSodaPepsi",0.1} - ,{"FoodCanBakedBeans",0.06} - ,{"FoodCanSardines",0.06} - ,{"FoodCanFrankBeans",0.06} - ,{"FoodCanPasta",0.06} - ,{"ItemBandage",0.1} - ,{"ItemPainkiller",0.06} - ,{"ItemComboLock",0.04} - ,{"ItemSledgeHead",0.02} - }; - clothes[] = { - {"Skin_RU_Policeman_DZ",0.13} - ,{"Skin_Pilot_EP1_DZ",0.12} - ,{"Skin_Functionary1_EP1_DZ",0.1} - ,{"Skin_Priest_DZ",0.1} - ,{"Skin_Rocker1_DZ",0.07} - ,{"Skin_Rocker2_DZ",0.07} - ,{"Skin_Rocker3_DZ",0.08} - ,{"Skin_Rocker4_DZ",0.08} - ,{"Skin_SurvivorW3_DZ",0.09} - ,{"Skin_SurvivorWpink_DZ",0.09} - ,{"Skin_SurvivorWurban_DZ",0.07} - }; - militaryclothes[] = { - {"Skin_Camo1_DZ",0.1} - ,{"Skin_Sniper1_DZ",0.08} - ,{"Skin_Rocket_DZ",0.05} - ,{"Skin_Soldier1_DZ",0.13} - ,{"Skin_Drake_Light_DZ",0.07} - ,{"Skin_Soldier_TL_PMC_DZ",0.07} - ,{"Skin_Soldier_Sniper_PMC_DZ",0.05} - ,{"Skin_Soldier_Bodyguard_AA12_PMC_DZ",0.07} - ,{"Skin_CZ_Special_Forces_GL_DES_EP1_DZ",0.08} - ,{"Skin_FR_OHara_DZ",0.08} - ,{"Skin_FR_Rodriguez_DZ",0.09} - ,{"Skin_CZ_Soldier_Sniper_EP1_DZ",0.04} - ,{"Skin_Graves_Light_DZ",0.09} - }; - specialclothes[] = { - {"Skin_Ins_Soldier_GL_DZ",0.1} - ,{"Skin_GUE_Commander_DZ",0.08} - ,{"Skin_Bandit1_DZ",0.13} - ,{"Skin_Bandit2_DZ",0.06} - ,{"Skin_BanditW1_DZ",0.07} - ,{"Skin_BanditW2_DZ",0.07} - ,{"Skin_TK_INS_Soldier_EP1_DZ",0.05} - ,{"Skin_TK_INS_Warlord_EP1_DZ",0.07} - ,{"Skin_SurvivorWcombat_DZ",0.08} - ,{"Skin_SurvivorWdesert_DZ",0.08} - ,{"Skin_GUE_Soldier_MG_DZ",0.05} - ,{"Skin_GUE_Soldier_Sniper_DZ",0.04} - ,{"Skin_GUE_Soldier_Crew_DZ",0.04} - ,{"Skin_GUE_Soldier_CO_DZ",0.04} - ,{"Skin_GUE_Soldier_2_DZ",0.04} - }; - machinegunammoexpl[] = { - {"100Rnd_556x45_BetaCMag",0.2} - ,{"75Rnd_545x39_RPK",0.2} - ,{"100Rnd_556x45_M249",0.15} - ,{"100Rnd_762x51_M240",0.15} - ,{"100Rnd_762x54_PK",0.14} - ,{"200Rnd_556x45_M249",0.14} - ,{"MAAWS_HEAT",0.01} - ,{"PipeBomb",0.01} - }; - pistols[] = { - {"Makarov",0.25} - ,{"Colt1911",0.23} - ,{"revolver_EP1",0.2} - ,{"glock17_EP1",0.1} - ,{"MakarovSD",0.1} - ,{"M9",0.07} - ,{"M9SD",0.04} - ,{"revolver_gold_EP1",0.01} - }; -}; diff --git a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp similarity index 78% rename from SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp rename to SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp index 9e2dc4dc8..3c09f3051 100644 --- a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp @@ -1,4 +1,5 @@ -#include "cfgLoot.hpp" +#include "CfgLoot.hpp" + class CfgBuildingLoot { class Default { zombieChance = 0.2; @@ -7,23 +8,68 @@ class CfgBuildingLoot { zombieClass[] = {"zZombie_Base","z_hunter","z_teacher","z_suit1","z_suit2","z_worker1","z_worker2","z_worker3","z_villager1","z_villager2","z_villager3"}; lootChance = 0; lootPos[] = {}; - lootPosSmall[] = {}; - lootPosZombie[] = {}; itemType[] = {}; - itemChance[] = {}; - itemTypeSmall[] = {}; - itemChanceSmall[] = {}; hangPos[] = {}; vehPos[] = {}; }; + //New System + class Church: Default { + zombieChance = 0.3; + minRoaming = 1; + maxRoaming = 3; + zombieClass[] = {"z_priest","z_priest","z_priest"}; + lootChance = 0.3; + lootPos[] = {}; + lootType[] = { + //one spawn + //tools + //{"ItemMatchbox","generic",0.02}, + //weapons + //special + //mags special + //{"ItemBookBible","magazine",0.03}, + //bags + //multiple spawns + {"","Church",0.50}, + {"","generic",0.50} + }; + }; + class Castle: Default { + lootChance = 0.2; + lootPos[] = {}; + lootType[] = { + //one spawn + //tools + //{"ItemMatchbox","weapon",0.01}, + {"ItemKnife","weapon",0.01}, + {"ItemMap","generic",0.01}, + {"ItemCompass","weapon",0.01}, + {"ItemFlashlight","weapon",0.01}, + //weapons + {"WeaponHolder_ItemHatchet","object",0.01}, + //special + {"WeaponHolder_ItemTent","object",0.01}, + //{"WeaponHolder_DomeTentStorage","object",0.01}, + //mags special + {"PartWoodPile","magazine",0.04}, + //bags + //{"DZ_Patrol_Pack_EP1","object",0.01}, + //Multiple spawns + //{"","Residential",0.60}, + {"","generic",0.40} + }; + }; class Residential: Default { zombieChance = 0.3; maxRoaming = 2; zombieClass[] = {"zZombie_Base","z_hunter","z_teacher","z_villager1","z_villager2","z_villager3"}; lootChance = 0.4; lootPos[] = {}; - itemChance[] = { - {"ItemWatch","generic",0.04} + lootType[] = { + {"ItemSodaMdew","magazine",0.01} + ,{"ItemSodaRbull","magazine",0.01} + ,{"ItemSodaOrangeSherbet","magazine",0.02} + ,{"ItemWatch","generic",0.04} ,{"ItemCompass","generic",0.03} ,{"ItemMap","weapon",0.02} ,{"pistols","cfglootweapon",0.1} @@ -42,24 +88,6 @@ class CfgBuildingLoot { ,{"WeaponHolder_MeleeCrowbar","object",0.03} ,{"shotgunsingleshot","cfglootweapon",0.06} }; - itemChanceSmall[] = { - {"ItemSodaMdew","magazine",0.01} - ,{"ItemSodaRbull","magazine",0.01} - ,{"ItemSodaOrangeSherbet","magazine",0.02} - ,{"ItemWatch","weapon",0.05} - ,{"ItemCompass","weapon",0.04} - ,{"ItemMap","weapon",0.03} - ,{"pistols","cfglootweapon",0.12} - ,{"ItemFlashlight","weapon",0.02} - ,{"ItemKnife","weapon",0.04} - ,{"ItemMatchbox_DZE","weapon",0.03} - ,{"","generic",0.38} - ,{"","military",0.04} - ,{"","trash",0.17} - ,{"Binocular","weapon",0.02} - ,{"clothes","single",0.01} - ,{"specialclothes","single",0.01} - }; }; class Office: Default { maxRoaming = 3; @@ -67,8 +95,11 @@ class CfgBuildingLoot { zombieChance = 0.3; lootChance = 0.4; lootPos[] = {}; - itemChance[] = { - {"ItemWatch","generic",0.04} + lootType[] = { + {"ItemSodaMdew","magazine",0.01} + ,{"ItemSodaRbull","magazine",0.01} + ,{"ItemSodaOrangeSherbet","magazine",0.02} + ,{"ItemWatch","generic",0.04} ,{"ItemCompass","generic",0.03} ,{"ItemMap","weapon",0.02} ,{"pistols","cfglootweapon",0.11} @@ -87,24 +118,6 @@ class CfgBuildingLoot { ,{"specialclothes","single",0.01} ,{"WeaponHolder_MeleeCrowbar","object",0.03} ,{"ItemBriefcaseEmpty","magazine",0.01} - }; - itemChanceSmall[] = { - {"ItemSodaMdew","magazine",0.01} - ,{"ItemSodaRbull","magazine",0.01} - ,{"ItemSodaOrangeSherbet","magazine",0.02} - ,{"ItemWatch","weapon",0.05} - ,{"ItemCompass","weapon",0.04} - ,{"ItemMap","weapon",0.03} - ,{"pistols","cfglootweapon",0.15} - ,{"ItemFlashlight","weapon",0.02} - ,{"ItemKnife","weapon",0.05} - ,{"ItemMatchbox_DZE","weapon",0.03} - ,{"","generic",0.31} - ,{"","military",0.04} - ,{"","trash",0.03} - ,{"Binocular","weapon",0.02} - ,{"clothes","single",0.16} - ,{"specialclothes","single",0.02} ,{"ItemDocument","magazine",0.01} }; }; @@ -114,7 +127,7 @@ class CfgBuildingLoot { maxRoaming = 2; lootChance = 0.4; lootPos[] = {}; - itemChance[] = { + lootType[] = { {"ItemGenerator","magazine",0.01} ,{"ItemFuelBarrelEmpty","magazine",0.01} ,{"","generic",0.17} @@ -136,13 +149,6 @@ class CfgBuildingLoot { ,{"CinderBlocks","magazine",0.03} ,{"MortarBucket","magazine",0.01} }; - itemChanceSmall[] = { - {"","generic",0.5} - ,{"","trash",0.28} - ,{"","military",0.14} - ,{"ItemKnife","weapon",0.07} - ,{"ItemKeyKit","weapon",0.01} - }; }; class IndustrialFuel: Default { zombieChance = 0.4; @@ -150,7 +156,7 @@ class CfgBuildingLoot { maxRoaming = 2; lootChance = 0.4; lootPos[] = {}; - itemChance[] = { + lootType[] = { {"ItemGenerator","magazine",0.01} ,{"ItemFuelPump","magazine",0.01} ,{"","generic",0.18} @@ -170,13 +176,6 @@ class CfgBuildingLoot { ,{"ItemTankTrap","magazine",0.04} ,{"ItemKeyKit","weapon",0.01} }; - itemChanceSmall[] = { - {"","generic",0.5} - ,{"","trash",0.28} - ,{"","military",0.14} - ,{"ItemKnife","weapon",0.07} - ,{"ItemKeyKit","weapon",0.01} - }; }; class Farm: Default { zombieChance = 0.3; @@ -184,7 +183,7 @@ class CfgBuildingLoot { zombieClass[] = {"zZombie_Base","z_hunter","z_hunter","z_hunter","z_villager1","z_villager2","z_villager3"}; lootChance = 0.5; lootPos[] = {}; - itemChance[] = { + lootType[] = { {"ItemJerrycan","magazine",0.05} ,{"","generic",0.3} ,{"farmweapons","cfglootweapon",0.18} @@ -197,13 +196,6 @@ class CfgBuildingLoot { ,{"ItemLightBulb","magazine",0.02} ,{"ItemSledgeHandle","magazine",0.02} }; - itemChanceSmall[] = { - {"","generic",0.79} - ,{"","trash",0.14} - ,{"","military",0.05} - ,{"ItemLightBulb","magazine",0.01} - ,{"ItemSledgeHead","magazine",0.01} - }; }; class Supermarket: Default { lootChance = 0.6; @@ -211,8 +203,11 @@ class CfgBuildingLoot { maxRoaming = 6; zombieChance = 0.3; zombieClass[] = {"zZombie_Base","zZombie_Base","z_teacher","z_suit1","z_suit2"}; - itemChance[] = { - {"ItemWatch","generic",0.07} + lootType[] = { + {"ItemSodaMdew","magazine",0.01} + ,{"ItemSodaRbull","magazine",0.01} + ,{"ItemSodaOrangeSherbet","magazine",0.03} + ,{"ItemWatch","generic",0.07} ,{"ItemCompass","generic",0.02} ,{"ItemMap","weapon",0.04} ,{"pistols","cfglootweapon",0.04} @@ -227,22 +222,6 @@ class CfgBuildingLoot { ,{"","trash",0.23} ,{"Binocular","weapon",0.05} ,{"PartPlywoodPack","magazine",0.02} - }; - itemChanceSmall[] = { - {"ItemSodaMdew","magazine",0.01} - ,{"ItemSodaRbull","magazine",0.01} - ,{"ItemSodaOrangeSherbet","magazine",0.03} - ,{"ItemWatch","weapon",0.07} - ,{"ItemCompass","weapon",0.03} - ,{"ItemMap","weapon",0.05} - ,{"pistols","cfglootweapon",0.08} - ,{"ItemFlashlight","weapon",0.01} - ,{"ItemKnife","weapon",0.02} - ,{"ItemMatchbox_DZE","weapon",0.04} - ,{"","generic",0.21} - ,{"","food",0.24} - ,{"","trash",0.16} - ,{"Binocular","weapon",0.02} ,{"ItemMixOil","magazine",0.02} }; }; @@ -252,7 +231,7 @@ class CfgBuildingLoot { zombieClass[] = {"z_soldier_pilot"}; lootChance = 0.5; lootPos[] = {}; - itemChance[] = { + lootType[] = { {"assaultrifles","cfglootweapon",0.1} ,{"submachinegun","cfglootweapon",0.04} ,{"sniperrifles","cfglootweapon",0.07} @@ -274,7 +253,7 @@ class CfgBuildingLoot { zombieClass[] = {"z_soldier_pilot"}; lootChance = 0.5; lootPos[] = {}; - itemChance[] = { + lootType[] = { {"assaultrifles","cfglootweapon",0.09} ,{"submachinegun","cfglootweapon",0.03} ,{"sniperrifles","cfglootweapon",0.05} @@ -297,15 +276,11 @@ class CfgBuildingLoot { zombieClass[] = {"z_doctor","z_doctor","z_doctor"}; lootChance = 1; lootPos[] = {}; - itemChance[] = { + lootType[] = { {"","trash",0.1} ,{"","hospital",0.7} ,{"MedBox0","object",0.2} }; - itemChanceSmall[] = { - {"","trash",0.1} - ,{"","hospital",0.9} - }; }; class Military: Default { zombieChance = 0.3; @@ -313,7 +288,7 @@ class CfgBuildingLoot { zombieClass[] = {"z_soldier","z_soldier_heavy","z_policeman"}; lootChance = 0.4; lootPos[] = {}; - itemChance[] = { + lootType[] = { {"pistols","cfglootweapon",0.04} ,{"assaultrifles","cfglootweapon",0.13} ,{"sniperrifles","cfglootweapon",0.04} @@ -332,19 +307,6 @@ class CfgBuildingLoot { ,{"ItemSandbag","magazine",0.02} ,{"machineguns","cfglootweapon",0.03} }; - itemChanceSmall[] = { - {"pistols","cfglootweapon",0.15} - ,{"Binocular","weapon",0.02} - ,{"ItemFlashlightRed","weapon",0.03} - ,{"ItemKnife","weapon",0.04} - ,{"ItemGPS","weapon",0.02} - ,{"ItemMap","weapon",0.02} - ,{"","medical",0.09} - ,{"","generic",0.34} - ,{"","military",0.26} - ,{"submachinegun","cfglootweapon",0.02} - ,{"ItemEtool","weapon",0.01} - }; }; class MilitaryIndustrial: Default { zombieChance = 0.3; @@ -352,7 +314,7 @@ class CfgBuildingLoot { zombieClass[] = {"z_soldier","z_soldier_heavy","z_policeman","z_soldier","z_soldier_heavy","z_policeman","z_worker1","z_worker2","z_worker3"}; lootChance = 0.4; lootPos[] = {}; - itemChance[] = { + lootType[] = { {"pistols","cfglootweapon",0.02} ,{"assaultrifles","cfglootweapon",0.05} ,{"PartGeneric","magazine",0.03} @@ -376,18 +338,6 @@ class CfgBuildingLoot { ,{"ItemFuelPump","magazine",0.01} ,{"machineguns","cfglootweapon",0.01} }; - itemChanceSmall[] = { - {"pistols","cfglootweapon",0.12} - ,{"Binocular","weapon",0.05} - ,{"ItemFlashlightRed","weapon",0.03} - ,{"ItemKnife","weapon",0.04} - ,{"ItemGPS","weapon",0.02} - ,{"","medical",0.02} - ,{"","generic",0.09} - ,{"","military",0.34} - ,{"submachinegun","cfglootweapon",0.26} - ,{"ItemEtool","weapon",0.03} - }; }; class IndustrialMilitary: Default { zombieChance = 0.4; @@ -395,7 +345,7 @@ class CfgBuildingLoot { zombieClass[] = {"z_soldier","z_soldier_heavy","z_policeman","z_soldier","z_soldier_heavy","z_policeman","z_worker1","z_worker2","z_worker3"}; lootChance = 0.5; lootPos[] = {}; - itemChance[] = { + lootType[] = { {"pistols","cfglootweapon",0.02} ,{"assaultrifles","cfglootweapon",0.05} ,{"PartGeneric","magazine",0.03} @@ -422,18 +372,6 @@ class CfgBuildingLoot { ,{"ItemFuelPump","magazine",0.01} ,{"machineguns","cfglootweapon",0.01} }; - itemChanceSmall[] = { - {"pistols","cfglootweapon",0.12} - ,{"Binocular","weapon",0.05} - ,{"ItemFlashlightRed","weapon",0.03} - ,{"ItemKnife","weapon",0.04} - ,{"ItemGPS","weapon",0.02} - ,{"","medical",0.02} - ,{"","generic",0.09} - ,{"","military",0.34} - ,{"submachinegun","cfglootweapon",0.26} - ,{"ItemEtool","weapon",0.03} - }; }; class MilitarySpecial: Default { zombieChance = 0.4; @@ -442,7 +380,7 @@ class CfgBuildingLoot { zombieClass[] = {"z_soldier_heavy"}; lootChance = 0.4; lootPos[] = {}; - itemChance[] = { + lootType[] = { {"assaultrifles","cfglootweapon",0.1} ,{"machineguns","cfglootweapon",0.04} ,{"pistols","cfglootweapon",0.08} @@ -464,25 +402,6 @@ class CfgBuildingLoot { ,{"machinegunammo","single",0.05} ,{"militaryclothes","single",0.05} ,{"NVGoggles","weapon",0.01} - }; - itemChanceSmall[] = { - {"pistols","cfglootweapon",0.1} - ,{"AmmoBoxSmall_556","object",0.02} - ,{"AmmoBoxSmall_762","object",0.02} - ,{"Binocular","weapon",0.02} - ,{"ItemFlashlightRed","military",0.01} - ,{"ItemKnife","military",0.02} - ,{"ItemGPS","weapon",0.01} - ,{"ItemMap","weapon",0.03} - ,{"Binocular_Vector","weapon",0.01} - ,{"","medical",0.06} - ,{"","generic",0.15} - ,{"","military",0.33} - ,{"5Rnd_86x70_L115A1","magazine",0.02} - ,{"10Rnd_127x99_m107","magazine",0.02} - ,{"machinegunammoexpl","single",0.05} - ,{"militaryclothes","single",0.04} - ,{"NVGoggles","weapon",0.02} ,{"100Rnd_762x54_PK","magazine",0.05} }; }; @@ -493,7 +412,7 @@ class CfgBuildingLoot { zombieClass[] = {"z_hunter","z_hunter","z_hunter"}; lootChance = 1; lootPos[] = {}; - itemChance[] = { + lootType[] = { {"ItemMap","weapon",0.02} ,{"ItemFlashlight","generic",0.01} ,{"ItemKnife","generic",0.01} @@ -503,14 +422,6 @@ class CfgBuildingLoot { ,{"WeaponHolder_ItemMachete","object",0.02} ,{"","hunter",0.5} }; - itemChanceSmall[] = { - {"ItemMap","weapon",0.02} - ,{"ItemFlashlight","weapon",0.02} - ,{"ItemKnife","weapon",0.02} - ,{"ItemMatchbox_DZE","weapon",0.04} - ,{"","military",0.4} - ,{"","hunter",0.5} - }; }; class DynamicDebris: Default { @@ -519,7 +430,7 @@ class CfgBuildingLoot { maxRoaming = 2; zombieChance = 0.3; zombieClass[] = {"zZombie_Base","zZombie_Base","z_teacher","z_suit1","z_suit2"}; - itemChance[] = { + lootType[] = { {"ItemWatch","generic",0.19} ,{"ItemCompass","generic",0.01} ,{"ItemMap","weapon",0.06} @@ -546,7 +457,7 @@ class CfgBuildingLoot { maxRoaming = 2; zombieChance = 0.3; zombieClass[] = {"z_soldier_pilot","z_soldier_heavy"}; - itemChance[] = { + lootType[] = { {"ItemEtool","weapon",0.05} ,{"ItemSandbag","magazine",0.1} ,{"","military",0.08} @@ -576,7 +487,7 @@ class CfgBuildingLoot { zombieClass[] = {"zZombie_Base","z_hunter","z_hunter","z_hunter","z_villager1","z_villager2","z_villager3","z_doctor","z_soldier_pilot","z_soldier_heavy"}; lootChance = 1; lootPos[] = {}; - itemChance[] = { + lootType[] = { {"PartPlywoodPack","magazine",0.1} ,{"PartPlankPack","magazine",0.2} ,{"CinderBlocks","magazine",0.1} @@ -593,7 +504,7 @@ class CfgBuildingLoot { zombieClass[] = {"zZombie_Base","z_hunter","z_hunter","z_hunter","z_villager1","z_villager2","z_villager3","z_doctor","z_soldier_pilot","z_soldier_heavy"}; lootChance = 1; lootPos[] = {}; - itemChance[] = { + lootType[] = { {"M16A2","weapon",0.03} ,{"M16A2GL","weapon",0.01} ,{"M249_EP1_DZ","weapon",0.01} @@ -652,9 +563,11 @@ class CfgBuildingLoot { ,{"m240_scoped_EP1_DZE","weapon",0.01} }; }; - #include "CfgLootPos.hpp" - //If you want to copypast your loottable to your mission w/o - //changing something on the lootPos then use the a include instead of copypasting the CfgLootPos.hpp - //#include "\dayz_epoch_b\CfgLootPos.hpp" + #include "CfgBuildingPos.hpp" + #include "DZE\CfgBuildingPos.hpp" + //If you want to copypast your loottable to your mission w/o + //changing something on the lootPos then use the a include instead of copypasting the CfgBuildingPos.hpp + + //#include "\dayz_epoch_b\CfgBuildingPos.hpp" }; diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp index 0f7b1de0b..40b50b27f 100644 --- a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp @@ -1,4 +1,3 @@ -#include "CfgLootSmall.hpp" class CfgLoot { trash[] = { {"TrashTinCan",0.5} diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp index 19770ba23..2b1bf2a30 100644 --- a/SQF/dayz_code/config.cpp +++ b/SQF/dayz_code/config.cpp @@ -126,7 +126,7 @@ class RscStructuredTextGUI: RscStructuredText #include "Configs\CfgMagazines.hpp" #include "Configs\CfgMarkers.hpp" #include "Configs\CfgAmmo.hpp" -#include "Configs\CfgBuildingLoot\CfgBuildingLoot.hpp" +#include "Configs\CfgLoot\CfgBuildingLoot.hpp" #include "Configs\CfgArma.hpp" #include "external\R3F_Realism\R3F_Weight\R3F_CfgWeight.h" \ No newline at end of file