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

More minor cleanup

Browse Source
This commit is contained in:
ebaydayz
2016-03-12 22:40:23 -05:00
parent 473e1eaedd
commit 4c6b636bc0
12 changed files with 76 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp
View File

@@ -19,11 +19,11 @@ AmmoCivilian[] =
{Loot_MAGAZINE, 5, 2Rnd_12Gauge_Slug}
};
militaryVehicleAmmo[] = { //DZE
{Loot_MAGAZINE, 2, 2000Rnd_762x51_M134}
,{Loot_MAGAZINE, 2, 29Rnd_30mm_AGS30}
,{Loot_MAGAZINE, 2, 50Rnd_127x107_DSHKM}
,{Loot_MAGAZINE, 2, 48Rnd_40mm_MK19}
,{Loot_MAGAZINE, 3, 100Rnd_127x99_M2}
{Loot_MAGAZINE, 2, 2000Rnd_762x51_M134},
{Loot_MAGAZINE, 2, 29Rnd_30mm_AGS30},
{Loot_MAGAZINE, 2, 50Rnd_127x107_DSHKM},
{Loot_MAGAZINE, 2, 48Rnd_40mm_MK19},
{Loot_MAGAZINE, 3, 100Rnd_127x99_M2}
};
AmmoMilitaryLow[] =
{
@@ -301,40 +301,40 @@ AmmoUN[] =
//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, 5Rnd_17HMR}
,{Loot_MAGAZINE, 3, 20Rnd_762x51_SB_SCAR}
,{Loot_MAGAZINE, 3, 20Rnd_9x39_SP5_VSS}
{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, 5Rnd_17HMR},
{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}
{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}
{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}
{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}
};

2
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/DZE_Other.hpp
View File

@@ -10,7 +10,6 @@ DynamicDebris[] =
{Loot_WEAPON, 5, ItemToolbox},
{Loot_WEAPON, 5, ItemHatchet_DZE},
{Loot_WEAPON, 5, ItemCompass},
{Loot_WEAPON, 5, ItemHatchet_DZE},
{Loot_PILE, 12, Consumable, 1, 2},
{Loot_MAGAZINE, 7, ItemJerryCan},
{Loot_GROUP, 15, Parts}
@@ -30,7 +29,6 @@ DynamicDebrisMilitary[] =
{Loot_WEAPON, 5, ItemToolbox},
{Loot_WEAPON, 5, ItemHatchet_DZE},
{Loot_WEAPON, 5, ItemCompass},
{Loot_WEAPON, 5, ItemHatchet_DZE},
{Loot_PILE, 12, Consumable, 1, 2},
{Loot_MAGAZINE, 7, ItemJerryCan},
{Loot_MAGAZINE, 7, ItemSandbag},

2
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Hunting.hpp
View File

@@ -21,7 +21,7 @@ Hunting[] =
{Loot_MAGAZINE, 1, ItemDocument},
{Loot_MAGAZINE, 1, ItemMixOil},
//{Loot_WEAPON, 1, RedRyder},
//{Loot_MAGAZINE, 1, 350Rnd_BB_Magazine},
//{Loot_MAGAZINE, 1, 350Rnd_BB_Magazine},
//Backpacks
{Loot_GROUP, 5, backpacks},

49
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp
View File

@@ -41,51 +41,4 @@ Industrial[] =
{Loot_PILE, 10, Trash, 1, 3},
{Loot_PILE, 4, Consumable, 1, 2},
{Loot_GROUP, 8, Generic}
};
/* OLD
{Loot_WEAPON, 3, ItemKnife},
{Loot_WEAPON, 2, ItemToolbox},
{Loot_WEAPON, 6, ItemFlashlight},
{Loot_WEAPON, 8, ItemCrowbar},
{Loot_WEAPON, 5, ItemHatchet},
{Loot_WEAPON, 1, Mosin_Nagant},
{Loot_WEAPON, 3, Mosin_Nagant_broken},
{Loot_WEAPON, 1, ItemPickaxe},
{Loot_WEAPON, 2, ItemPickaxeBroken},
{Loot_WEAPON, 1, ItemSledgeHammer},
{Loot_WEAPON, 2, ItemSledgeHammerBroken},
{Loot_MAGAZINE, 6, ItemSandbag},
{Loot_MAGAZINE, 3, equip_rope},
{Loot_MAGAZINE, 1, ItemWire},
{Loot_MAGAZINE, 4, ItemTankTrap},
{Loot_MAGAZINE, 1, ItemSodaSmasht},
{Loot_MAGAZINE, 1, ItemSodaDrwaste},
{Loot_MAGAZINE, 1, FoodCanPowell},
{Loot_MAGAZINE, 1, FoodChipsSulahoops},
{Loot_MAGAZINE, 1, equip_brick},
{Loot_MAGAZINE, 3, equip_duct_tape},
{Loot_MAGAZINE, 2, equip_hose},
{Loot_MAGAZINE, 6, equip_nails},
{Loot_MAGAZINE, 1, equip_rag},
{Loot_MAGAZINE, 1, equip_lever},
{Loot_MAGAZINE, 1, equip_scrapelectronics},
{Loot_MAGAZINE, 2, equip_metal_sheet},
{Loot_MAGAZINE, 2, equip_2inch_metal_pipe},
{Loot_MAGAZINE, 2, equip_1inch_metal_pipe},
{Loot_MAGAZINE, 16, ItemPlank},
{Loot_MAGAZINE, 4, PartGeneric},
{Loot_MAGAZINE, 5, PartWheel},
{Loot_MAGAZINE, 2, PartFueltank},
{Loot_MAGAZINE, 2, PartEngine},
{Loot_MAGAZINE, 4, PartGlass},
{Loot_MAGAZINE, 4, ItemJerrycan},
{Loot_MAGAZINE, 3, ItemFuelcan},
{Loot_GROUP, 10, Trash},
{Loot_GROUP, 5, ammo},
{Loot_GROUP, 8, generic},
{Loot_GROUP, 3, attachmentsGeneric},
*/
};

4
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Office.hpp
View File

@@ -31,8 +31,8 @@ Office[] =
{Loot_MAGAZINE, 1, ItemLockbox},
{Loot_MAGAZINE, 1, PartPlywoodPack},
{Loot_MAGAZINE, 1, ItemDocument},
//{Loot_MAGAZINE, 3, 10Rnd_303British}, //IN GENERIC
//{Loot_MAGAZINE, 1, 5Rnd_17HMR}, //IN GENERIC
//{Loot_MAGAZINE, 3, 10Rnd_303British}, //IN GENERIC
//{Loot_MAGAZINE, 1, 5Rnd_17HMR}, //IN GENERIC
//Groups
{Loot_GROUP, 8, Consumable},

2
SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Supermarket.hpp
View File

@@ -24,7 +24,7 @@ Supermarket[] =
{Loot_GROUP, 5, backpacks},
//Items
//{Loot_MAGAZINE, 1, ItemTent}, //USE TENTS GROUP
//{Loot_MAGAZINE, 1, ItemTent}, //USE TENTS GROUP
{Loot_MAGAZINE, 1, ItemMixOil},
{Loot_MAGAZINE, 1, PartPlywoodPack},
{Loot_MAGAZINE, 0.5, ItemDomeTent},

2
SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp
View File

@@ -27,7 +27,7 @@ Generic[] =
};
//DZE
tents[] = {
{Loot_MAGAZINE, 1.1, WeaponHolder_ItemTentOld},
{Loot_MAGAZINE, 1.1, WeaponHolder_ItemTentOld},
{Loot_MAGAZINE, 1, WeaponHolder_ItemTentDomed},
{Loot_MAGAZINE, 1, WeaponHolder_ItemTentDomed2}
};

54
SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
View File

@@ -8,17 +8,17 @@
pistols[] = {
{Loot_WEAPON, 2, Makarov},
{Loot_WEAPON, 2, Colt1911},
{Loot_WEAPON, 1.5, revolver_EP1},
{Loot_WEAPON, 1.5, revolver_EP1},
{Loot_WEAPON, 1, glock17_EP1},
{Loot_WEAPON, 1, MakarovSD},
{Loot_WEAPON, 0.7, M9},
{Loot_WEAPON, 0.5, M9SD},
{Loot_WEAPON, 0.1, revolver_gold_EP1}
{Loot_WEAPON, 0.7, M9},
{Loot_WEAPON, 0.5, M9SD},
{Loot_WEAPON, 0.1, revolver_gold_EP1}
};
shotgunsingleshot[] = {
{Loot_WEAPON, 2, Winchester1866},
{Loot_WEAPON, 1.7, LeeEnfield},
{Loot_WEAPON, 1.7, MR43},
{Loot_WEAPON, 1.7, LeeEnfield},
{Loot_WEAPON, 1.7, MR43},
{Loot_WEAPON, 1, Saiga12K},
{Loot_WEAPON, 1, Remington870_lamp},
{Loot_WEAPON, 1, Crossbow_DZ},
@@ -35,30 +35,30 @@ farmweapons[] = {
};
sniperrifles[] = {
{Loot_WEAPON, 1, AK_107_PSO},
{Loot_WEAPON, 0.9, M4SPR},
{Loot_WEAPON, 0.9, M40A3},
{Loot_WEAPON, 0.7, SVD_CAMO},
{Loot_WEAPON, 0.7, SVD_des_EP1},
{Loot_WEAPON, 0.7, SVD},
{Loot_WEAPON, 0.9, M4SPR},
{Loot_WEAPON, 0.9, M40A3},
{Loot_WEAPON, 0.7, SVD_CAMO},
{Loot_WEAPON, 0.7, SVD_des_EP1},
{Loot_WEAPON, 0.7, SVD},
{Loot_WEAPON, 1, huntingrifle},
{Loot_WEAPON, 0.8, M24_des_EP1},
{Loot_WEAPON, 0.8, M24},
{Loot_WEAPON, 0.7, BAF_LRR_scoped},
{Loot_WEAPON, 0.5, M107_DZ},
{Loot_WEAPON, 0.5, KSVK_DZE},
{Loot_WEAPON, 0.5, VSS_vintorez},
{Loot_WEAPON, 0.6, SCAR_H_LNG_Sniper_SD},
{Loot_WEAPON, 0.8, M24_des_EP1},
{Loot_WEAPON, 0.8, M24},
{Loot_WEAPON, 0.7, BAF_LRR_scoped},
{Loot_WEAPON, 0.5, M107_DZ},
{Loot_WEAPON, 0.5, KSVK_DZE},
{Loot_WEAPON, 0.5, VSS_vintorez},
{Loot_WEAPON, 0.6, SCAR_H_LNG_Sniper_SD},
{Loot_WEAPON, 1, M14_EP1},
{Loot_WEAPON, 1, DMR}
};
submachinegun[] = {
{Loot_WEAPON, 2, UZI_EP1},
{Loot_WEAPON, 1.5, bizon},
{Loot_WEAPON, 1.5, Sa61_EP1},
{Loot_WEAPON, 1.5, bizon},
{Loot_WEAPON, 1.5, Sa61_EP1},
{Loot_WEAPON, 1, MP5A5},
{Loot_WEAPON, 1, bizon_silenced},
{Loot_WEAPON, 0.8, UZI_SD_EP1},
{Loot_WEAPON, 0.7, MP5SD}
{Loot_WEAPON, 0.8, UZI_SD_EP1},
{Loot_WEAPON, 0.7, MP5SD}
};
assaultrifles[] = {
{Loot_WEAPON, 0.5, AKS_74_kobra},
@@ -94,8 +94,8 @@ assaultrifles[] = {
{Loot_WEAPON, 0.1, M4A1_HWS_GL_SD_Camo}
};
machineguns[] = {
{Loot_WEAPON, 1.1, RPK_74},
{Loot_WEAPON, 1.1, M8_SAW},
{Loot_WEAPON, 1.1, RPK_74},
{Loot_WEAPON, 1.1, M8_SAW},
{Loot_WEAPON, 1, Pecheneg_DZ},
{Loot_WEAPON, 1, PK_DZ},
{Loot_WEAPON, 1, MG36_camo},
@@ -103,9 +103,9 @@ machineguns[] = {
{Loot_WEAPON, 1, MG36},
{Loot_WEAPON, 1, M249_m145_EP1_DZE},
{Loot_WEAPON, 1, m240_scoped_EP1_DZE},
{Loot_WEAPON, 0.8, M240_DZ},
{Loot_WEAPON, 0.8, M249_EP1_DZ},
{Loot_WEAPON, 0.5, Mk_48_DZ}
{Loot_WEAPON, 0.8, M240_DZ},
{Loot_WEAPON, 0.8, M249_EP1_DZ},
{Loot_WEAPON, 0.5, Mk_48_DZ}
};
militaryshotguns[] = {
{Loot_WEAPON, 2, Saiga12K},

2
SQF/dayz_code/Configs/CfgVehicles/DZE/WeaponHolder.hpp
View File

@@ -1,6 +1,6 @@
class WeaponHolder_ItemHatchet_DZE: WeaponHolderBase {
scope = public;
displayName = $STR_EQUIP_NAME_41;
displayName = $STR_EQUIP_NAME_HATCHET;
model = "\dayz_equip\models\hatchet.p3d";
class eventHandlers {
init = "[(_this select 0),'cfgWeapons','ItemHatchet_DZE'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';";

6
SQF/dayz_code/Configs/CfgWeapons/Melee/Hatchet.hpp
View File

@@ -47,7 +47,7 @@ class MeleeHatchet_DZE: MeleeWeapon
model="\dayz_weapons\models\Hatchet_weaponized";
picture="\dayz_equip\textures\equip_hatchet_CA.paa";
displayName=$STR_EQUIP_NAME_41;
displayName=$STR_EQUIP_NAME_HATCHET;
droppeditem= "ItemHatchet_DZE";
magazines[]=
{
@@ -83,7 +83,7 @@ class MeleeHatchet_DZE: MeleeWeapon
};
class Library
{
libTextDesc=$STR_EQUIP_DESC_41;
libTextDesc=$STR_EQUIP_DESC_HATCHET;
};
descriptionShort=$STR_EQUIP_DESC_41;
descriptionShort=$STR_EQUIP_DESC_HATCHET;
};

19
SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp
View File

@@ -88,27 +88,16 @@ class Item1Matchbox : ItemMatchbox
matches = 1;
};
};
// EPOCH ADDITION
class ItemMatchbox_DZE: ItemMatchbox
{
scope = public;
//displayName = $STR_EQUIP_NAME_3;
//model = "\dayz_equip\models\matchbox_gear.p3d";
//picture = "\dayz_equip\textures\equip_matchbox_ca.paa";
//descriptionShort = $STR_EQUIP_DESC_3;
class Ignators
{
chance = 1;
matches = -1;
qtyRemaining = "ItemMatchbox_DZE"; //Use new matchbox system but don't reduce quantity
};
class ItemActions
{
class Use
{
text = $STR_ACTIONS_LIGHTFIRE;
script = "spawn player_makeFire;";
use[] = {"PartWoodPile"};
};
};
};

16
SQF/dayz_code/stringtable.xml
View File

@@ -4374,22 +4374,6 @@
<Czech>Ráže: 12&lt;br/&gt;Munice: 2 patrony&lt;br/&gt;Pro: M1014</Czech>
<German>Kaliber 12 Schrotmunition&lt;br/&gt;2 Schuss&lt;br/&gt;Verwendet in: M1014</German>
</Key>
<Key ID="STR_EQUIP_NAME_41">
<English>Hatchet</English>
<German>Beil</German>
<Russian>Топорик</Russian>
<Spanish>Hacha</Spanish>
<French>Hâche</French>
<Czech>Sekera</Czech>
</Key>
<Key ID="STR_EQUIP_DESC_41">
<English>A single-handed striking tool with a sharp blade used to cut and split wood.</English>
<German>Ein einhaendig gefuehrtes Schlagwerkzeug mit scharfer Klinge, das zum Hacken und Spalten von Holz verwendet wird.</German>
<Russian>Топор отлично подойдет для рубки дров.</Russian>
<Spanish>Una herramienta con una hoja afilada usada para cortar madera.</Spanish>
<French>Un outil à une main doté d&apos;une lame tranchante, utilisé pour couper et fendre du bois.</French>
<Czech>Jednoruční nástroj, který se používá pro sekání dřeva.</Czech>
</Key>
<Key ID="STR_CHAR_1">
<English>Survivor</English>
<German>Überlebender</German>