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

Revert "Revert "Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch""

Browse Source 
This reverts commit 109ec5c9a3.
This commit is contained in:
seelenapparat
2021-08-24 15:47:06 +02:00
parent c801365a1f
commit d1abb66e9f
145 changed files with 9200 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

527
SQF/dayz_code/Configs/CfgMagazines/Buildings/StaticWeapons.hpp Normal file
View File

@@ -0,0 +1,527 @@
class M2_MG_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_M2_MG;
descriptionShort = $STR_DN_M2_MG;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "M2_MG_Static_DZ";
};
};
};
class M2_TriPod_MG_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_M2HD_MINITRIPOD;
descriptionShort = $STR_DN_M2HD_MINITRIPOD;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "M2_TriPod_MG_Static_DZ";
};
};
};
class DSHKM_MG_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_DSHKM;
descriptionShort = $STR_DN_DSHKM;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "DSHKM_MG_Static_DZ";
};
};
};
class DSHKM_TriPod_MG_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_DSHKM_MINITRIPOD;
descriptionShort = $STR_DN_DSHKM_MINITRIPOD;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "DSHKM_TriPod_MG_Static_DZ";
};
};
};
class KORD_TriPod_MG_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_KORD_LOW;
descriptionShort = $STR_DN_KORD_LOW;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "KORD_Tripod_MG_Static_DZ";
};
};
};
class KORD_MG_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_KORD;
descriptionShort = $STR_DN_KORD;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "KORD_MG_Static_DZ";
};
};
};
class L2A1_MG_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_BAF_BAF_L2A1_TRIPOD_D0;
descriptionShort = $STR_BAF_BAF_L2A1_TRIPOD_D0;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "L2A1_MG_Static_DZ";
};
};
};
class L2A1_Tripod_MG_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_BAF_BAF_L2A1_MINITRIPOD_D0;
descriptionShort = $STR_BAF_BAF_L2A1_MINITRIPOD_D0;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "L2A1_Tripod_MG_Static_DZ";
};
};
};
class GMG_Tripod_MG_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_BAF_BAF_GMG_TRIPOD_D0;
descriptionShort = $STR_BAF_BAF_GMG_TRIPOD_D0;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "GMG_Tripod_MG_Static_DZ";
};
};
};
class AGS30_GrenadeLauncher_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_AGS30;
descriptionShort = $STR_DN_AGS30;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "AGS30_GrenadeLauncher_Static_DZ";
};
};
};
class MK19_TriPod_GrenadeLauncher_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_MK19_TRIPOD;
descriptionShort = $STR_DN_MK19_TRIPOD;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "MK19_TriPod_GrenadeLauncher_Static_DZ";
};
};
};
class GPMG_TriPod_GrenadeLauncher_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_BAF_BAF_GPMG_MINITRIPOD_D0;
descriptionShort = $STR_BAF_BAF_GPMG_MINITRIPOD_D0;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "GPMG_TriPod_GrenadeLauncher_Static_DZ";
};
};
};
class M119_Artillery_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_M119;
descriptionShort = $STR_DN_M119;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "M119_Artillery_Static_DZ";
};
};
};
class D30_Artillery_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_D30;
descriptionShort = $STR_DN_D30;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "D30_Artillery_Static_DZ";
};
};
};
class SearchLight_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_SEARCHLIGHT;
descriptionShort = $STR_DN_SEARCHLIGHT;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "SearchLight_Static_DZ";
};
};
};
class M252_Mortar_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_M252;
descriptionShort = $STR_DN_M252;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "M252_Mortar_Static_DZ";
};
};
};
class 2b14_82mm_Mortar_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_2B14;
descriptionShort = $STR_DN_2B14;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "2b14_82mm_Mortar_Static_DZ";
};
};
};
class Metis_Launcher_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_AT13;
descriptionShort = $STR_DN_AT13;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "Metis_Launcher_Static_DZ";
};
};
};
class SPG9_Launcher_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_SPG9;
descriptionShort = $STR_DN_SPG9;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "SPG9_Launcher_Static_DZ";
};
};
};
class Stinger_Tripod_Launcher_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_STINGER_POD;
descriptionShort = $STR_DN_STINGER_POD;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "Stinger_Tripod_Launcher_Static_DZ";
};
};
};
class TOW_Tripod_Launcher_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_TOW_TRIPOD;
descriptionShort = $STR_DN_TOW_TRIPOD;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "TOW_Tripod_Launcher_Static_DZ";
};
};
};
class Rbs70_Launcher_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_ACR_DN_RBS70;
descriptionShort = $STR_ACR_DN_RBS70;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "Rbs70_Launcher_Static_DZ";
};
};
};
class Igla_AntiAir_Launcher_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_IGLA_AA_POD_EAST;
descriptionShort = $STR_DN_IGLA_AA_POD_EAST;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "Igla_AntiAir_Launcher_Static_DZ";
};
};
};
class ZU23_AntiAir_Static_kit: CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_DN_ZU23;
descriptionShort = $STR_DN_ZU23;
model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
class ItemActions
{
class Build
{
text = $STR_ACTIONS_BUILD;
script = "spawn player_build;";
require[] = {"ItemToolbox"};
create = "ZU23_AntiAir_Static_DZ";
};
};
};

3
SQF/dayz_code/Configs/CfgMagazines/CfgMagazines.hpp
View File

@@ -65,5 +65,6 @@ class CfgMagazines
#include "Buildings\Fences.hpp"
#include "Buildings\Storage.hpp"
#include "Buildings\Tent.hpp"
#include "Buildings\Misc.hpp"
#include "Buildings\Misc.hpp"
#include "Buildings\StaticWeapons.hpp"
};

154
SQF/dayz_code/Configs/CfgMagazines/Items/Misc.hpp
View File

@@ -262,6 +262,160 @@ class ItemCeramicParts : CA_Magazine
type = 256;
};
class ItemWeaponPartsPistol : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_PISTOL;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_PISTOL_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsSMG : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_SMG;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_SMG_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsShotgun : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_SHOTGUN;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_SHOTGUN_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsRifle : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_RIFLE;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_RIFLE_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsSniperRilfe : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_SNIPERRIFLE;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_SNIPERRIFLE_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsMG : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_MG;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_MG_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsUnknown : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_UNKNOWN_MG;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_UNKNOWN_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsBad : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_BAD;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_BAD_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsNormal : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_NORMAL;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_NORMAL_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsGood : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_GOOD;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_GOOD_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsExecellent : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_EXCELLENT;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_EXCELLENT_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemGunPowderSmall : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_GUN_POWDER_SMALL;
descriptionShort = $STR_EPOCH_GUN_POWDER_SMALL_DESC;
model = "\z\addons\dayz_communityassets\models\tin_powder.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_tin_powder_co.paa";
type = 256;
};
class ItemGunPowder : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_GUN_POWDER;
descriptionShort = $STR_EPOCH_GUN_POWDER_DESC;
model = "\z\addons\dayz_communityassets\models\tin_powder.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_tin_powder_co.paa";
type = 256;
};
class ItemGunPowderBig : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_GUN_POWDER_BIG;
descriptionShort = $STR_EPOCH_GUN_POWDER_BIG_DESC;
model = "\z\addons\dayz_communityassets\models\tin_powder.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_tin_powder_co.paa";
type = 256;
};
//No models
class equip_cable_tie : CA_Magazine
{

5
SQF/dayz_code/Configs/CfgMagazines/Magazines/50AE.hpp
View File

@@ -9,4 +9,9 @@ class 7Rnd_50AE_Deagle: CA_Magazine
ammo = "B_357mag_Ball";
count = 7;
initSpeed = 400;
class ItemActions
{
COMBINE_MAG
};
};

9
SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp
View File

@@ -50,7 +50,14 @@ class 100Rnd_556x45_BetaCMagSD: 100Rnd_556x45_BetaCMag {
};
/* STANAG <-> G36 */
class 20Rnd_556x45_Stanag;
class 20Rnd_556x45_Stanag : CA_Magazine
{
class ItemActions
{
COMBINE_MAG
};
};
class 30Rnd_556x45_Stanag : 20Rnd_556x45_Stanag
{
displayName = $STR_DZ_MAG_30RND_556x45_STANAG_NAME;

2
SQF/dayz_code/Configs/CfgMagazines/Magazines/VehicleAmmo.hpp
View File

@@ -1484,7 +1484,7 @@ class 8Rnd_82mmILLUM_2B14: 8Rnd_82mmHE_2B14
};
class 200Rnd_40mmHE_FV510: Vehicle_ammo_base
{
scope = 1;
scope = 2;
displayName = $STR_DZ_MAG_200RND_FV510HE_NAME;
descriptionShort = $STR_DZ_MAG_200RND_FV510HE_DESC;
ammo = "Sh_40_HE";