From a118851ca84892b99939e2795e97b53647ad409c Mon Sep 17 00:00:00 2001 From: icomrade Date: Thu, 25 Feb 2016 09:49:29 -0500 Subject: [PATCH] Loot Defines done, need to do building loot now Add legacy loot defines, needs new blood bags if server wants to use bloodtype system. --- SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp | 10 ++-- .../Configs/CfgLoot/CfgLootSmall.hpp | 5 +- SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp | 45 ++++++++++++++++ .../Configs/CfgLoot/Groups/Backpacks.hpp | 2 +- .../Configs/CfgLoot/Groups/Weapons.hpp | 51 ++----------------- SQF/dayz_code/NOTE.txt | 8 ++- 6 files changed, 66 insertions(+), 55 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp index 18a4ee4f4..bfd728bfe 100644 --- a/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/CfgLoot.hpp @@ -37,6 +37,10 @@ class CfgLoot #include "Groups\Consumable.hpp" #include "Groups\ConsumableItems.hpp" #include "Groups\Parts.hpp" + //DZE + #include "Groups\Weapons.hpp" + #include "Groups\Clothes.hpp" + #include "Groups\Backpacks.hpp" // Points of interest #include "Groups\CrashSite.hpp" @@ -66,6 +70,7 @@ class CfgLoot #include "Groups\Zombies\Hunter.hpp" #include "Groups\Zombies\Police.hpp" #include "Groups\Zombies\Military.hpp" + #include "Groups\Zombies\Worker.hpp" //DZE #undef DZ_BP_VestPouch #undef DZ_BP_Patrol @@ -139,7 +144,7 @@ class CfgLoot #include "Buildings\Misc.hpp" }; }; -/* //OLD SYSTEM MAKE INTO LEGACY SYSTEM? + #include "CfgLootSmall.hpp" class CfgLootLegacy { trash[] = { @@ -651,5 +656,4 @@ class CfgLootLegacy { ,{"Remington870_lamp",0.35} ,{"M1014",0.4} }; -}; -*/ +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgLootSmall.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgLootSmall.hpp index 14903dbb7..0e77201d6 100644 --- a/SQF/dayz_code/Configs/CfgLoot/CfgLootSmall.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/CfgLootSmall.hpp @@ -1,5 +1,4 @@ -// This file is kept as a reference prior to release, delete if I forget -/*class CfgLootSmall { +class CfgLootSmall { trash[] = { {"TrashTinCan",0.5}, {"TrashJackDaniels",0.05}, @@ -274,4 +273,4 @@ {"M9SD",0.04}, {"revolver_gold_EP1",0.01} }; -}; */ \ No newline at end of file +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp index e7a9492a0..79d763362 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp @@ -75,6 +75,11 @@ AmmoMilitaryLow[] = {Loot_MAGAZINE, 5, 1Rnd_Smoke_GP25}, //DZE + {Loot_MAGAZINE, 3, 5Rnd_127x108_KSVK}, + {Loot_MAGAZINE, 2, 10Rnd_127x99_m107}, + {Loot_MAGAZINE, 4, 5x_22_LR_17_HMR}, + {Loot_MAGAZINE, 3, 20Rnd_762x51_SB_SCAR}, + {Loot_MAGAZINE, 3, 20Rnd_9x39_SP5_VSS}, {Loot_MAGAZINE, 3, 5Rnd_86x70_L115A1}, {Loot_MAGAZINE, 3, 20Rnd_B_765x17_Ball}, {Loot_MAGAZINE, 4, 20Rnd_762x51_DMR}, @@ -286,4 +291,44 @@ AmmoUN[] = {Loot_MAGAZINE, 3, SmokeShell}, {Loot_MAGAZINE, 3, SmokeShellRed}, {Loot_MAGAZINE, 3, SmokeShellGreen} +}; + +//DZE +sniperriflesammo[] = { + {Loot_MAGAZINE, 3, 5Rnd_127x108_KSVK} + ,{Loot_MAGAZINE, 3, 5Rnd_86x70_L115A1} + ,{Loot_MAGAZINE, 2, 10Rnd_127x99_m107} + ,{Loot_MAGAZINE, 3, 10Rnd_762x54_SVD} + ,{Loot_MAGAZINE, 4, 20Rnd_762x51_DMR} + ,{Loot_MAGAZINE, 4, 5Rnd_762x51_M24} + ,{Loot_MAGAZINE, 4, 5x_22_LR_17_HMR} + ,{Loot_MAGAZINE, 3, 20Rnd_762x51_SB_SCAR} + ,{Loot_MAGAZINE, 3, 20Rnd_9x39_SP5_VSS} +}; +assaultrifleammo[] = { + {Loot_MAGAZINE, 5, 30Rnd_545x39_AKSD} + ,{Loot_MAGAZINE, 5, 30Rnd_762x39_SA58} + ,{Loot_MAGAZINE, 5, 30Rnd_762x39_AK47} + ,{Loot_MAGAZINE, 8, 30Rnd_556x45_Stanag} + ,{Loot_MAGAZINE, 10, 30Rnd_545x39_AK} + ,{Loot_MAGAZINE, 5, 30Rnd_556x45_StanagSD} + ,{Loot_MAGAZINE, 8, 20Rnd_762x51_FNFAL} +}; +machinegunammo[] = { + {Loot_MAGAZINE, 4, 100Rnd_556x45_BetaCMag} + ,{Loot_MAGAZINE, 3, 75Rnd_545x39_RPK} + ,{Loot_MAGAZINE, 4, 100Rnd_556x45_M249} + ,{Loot_MAGAZINE, 3, 100Rnd_762x51_M240} + ,{Loot_MAGAZINE, 3, 100Rnd_762x54_PK} + ,{Loot_MAGAZINE, 4, 200Rnd_556x45_M249} +}; +machinegunammoexpl[] = { + {Loot_MAGAZINE, 4, 100Rnd_556x45_BetaCMag} + ,{Loot_MAGAZINE, 3, 75Rnd_545x39_RPK} + ,{Loot_MAGAZINE, 4, 100Rnd_556x45_M249} + ,{Loot_MAGAZINE, 3, 100Rnd_762x51_M240} + ,{Loot_MAGAZINE, 3, 100Rnd_762x54_PK} + ,{Loot_MAGAZINE, 4, 200Rnd_556x45_M249} + ,{Loot_MAGAZINE, 1, MAAWS_HEAT} + ,{Loot_MAGAZINE, 2, PipeBomb} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Backpacks.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Backpacks.hpp index f8460fd9b..c455d9b67 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Backpacks.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Backpacks.hpp @@ -12,5 +12,5 @@ militarybackpacks[] = { {Loot_BACKPACK, 2, DZ_GunBag_EP1}, {Loot_BACKPACK, 2, DZ_CivilBackpack_EP1}, {Loot_BACKPACK, 2, DZ_Backpack_EP1}, - {Loot_BACKPACK, 1, DZ_LargeGunBag_EP1}, + {Loot_BACKPACK, 1, DZ_LargeGunBag_EP1} }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index 24efc2c7b..fe7336f1d 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -43,19 +43,6 @@ sniperrifles[] = { ,{Loot_WEAPON, 1, M14_EP1} ,{Loot_WEAPON, 1, DMR} }; -/* -sniperriflesammo[] = { - {Loot_WEAPON, 10, 30Rnd_545x39_AKSD} - ,{Loot_WEAPON, 10, 5Rnd_127x108_KSVK} - ,{Loot_WEAPON, 10, 5Rnd_86x70_L115A1} - ,{Loot_WEAPON, 10, 10Rnd_127x99_m107} - ,{Loot_WEAPON, 10, 10Rnd_762x54_SVD} - ,{Loot_WEAPON, 10, 20Rnd_762x51_DMR} - ,{Loot_WEAPON, 10, 5Rnd_762x51_M24} - ,{Loot_WEAPON, 10, 5x_22_LR_17_HMR} - ,{Loot_WEAPON, 10, 20Rnd_762x51_SB_SCAR} - ,{Loot_WEAPON, 10, 20Rnd_9x39_SP5_VSS} -}; */ submachinegun[] = { {Loot_WEAPON, 2, UZI_EP1} ,{Loot_WEAPON, 1.5, bizon} @@ -98,16 +85,6 @@ assaultrifles[] = { ,{Loot_WEAPON, 0.1, BAF_L85A2_RIS_Holo} ,{Loot_WEAPON, 0.1, M4A1_HWS_GL_SD_Camo} }; -/* -assaultrifleammo[] = { - {Loot_WEAPON, 10, 30Rnd_762x39_SA58} - ,{Loot_WEAPON, 10, 30Rnd_762x39_AK47} - ,{Loot_WEAPON, 10, 30Rnd_556x45_Stanag} - ,{Loot_WEAPON, 10, 30Rnd_545x39_AK} - ,{Loot_WEAPON, 10, 30Rnd_556x45_StanagSD} - ,{Loot_WEAPON, 10, 20Rnd_762x51_FNFAL} -}; -*/ machineguns[] = { {Loot_WEAPON, 1.1, RPK_74} ,{Loot_WEAPON, 1.1, M8_SAW} @@ -122,28 +99,8 @@ machineguns[] = { ,{Loot_WEAPON, 0.8, M249_EP1_DZ} ,{Loot_WEAPON, 0.5, Mk_48_DZ} }; -/* -machinegunammo[] = { - {Loot_WEAPON, 10, 100Rnd_556x45_BetaCMag} - ,{Loot_WEAPON, 10, 75Rnd_545x39_RPK} - ,{Loot_WEAPON, 10, 100Rnd_556x45_M249} - ,{Loot_WEAPON, 10, 100Rnd_762x51_M240} - ,{Loot_WEAPON, 10, 100Rnd_762x54_PK} - ,{Loot_WEAPON, 10, 200Rnd_556x45_M249} -}; -machinegunammoexpl[] = { - {Loot_WEAPON, 10, 100Rnd_556x45_BetaCMag} - ,{Loot_WEAPON, 10, 75Rnd_545x39_RPK} - ,{Loot_WEAPON, 10, 100Rnd_556x45_M249} - ,{Loot_WEAPON, 10, 100Rnd_762x51_M240} - ,{Loot_WEAPON, 10, 100Rnd_762x54_PK} - ,{Loot_WEAPON, 10, 200Rnd_556x45_M249} - ,{Loot_WEAPON, 10, MAAWS_HEAT} - ,{Loot_WEAPON, 10, PipeBomb} -}; militaryshotguns[] = { - {Loot_WEAPON, 10, Saiga12K} - ,{Loot_WEAPON, 10, Remington870_lamp} - ,{Loot_WEAPON, 10, M1014} -}; -*/ \ No newline at end of file + {Loot_WEAPON, 2, Saiga12K} + ,{Loot_WEAPON, 2, Remington870_lamp} + ,{Loot_WEAPON, 2, M1014} +}; \ No newline at end of file diff --git a/SQF/dayz_code/NOTE.txt b/SQF/dayz_code/NOTE.txt index e47436161..70d727bd8 100644 --- a/SQF/dayz_code/NOTE.txt +++ b/SQF/dayz_code/NOTE.txt @@ -14,4 +14,10 @@ CHANGED WEAPON CLASSES {Loot_WEAPON, 1, M9SD}, {Loot_WEAPON, 2, G17_DZ}, {Loot_WEAPON, 2, Revolver_DZ}, - {Loot_WEAPON, 0.5, revolver_gold_EP1}, \ No newline at end of file + {Loot_WEAPON, 0.5, revolver_gold_EP1}, + +Create switchable blood system with variable. +Convert (if old system) to ItemBloodbag + +bloodBagANEG bloodBagAPOS bloodBagBNEG bloodBagBPOS bloodBagONEG bloodBagOPOS +wholeBloodBagANEG wholeBloodBagAPOS wholeBloodBagBNEG wholeBloodBagBPOS wholeBloodBagONEG wholeBloodBagOPOS \ No newline at end of file