W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-24 00:50:50 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change scope and type of configs from name to numbers

Browse Source 
This got discussed earlier. Since epoch got merged with DayZ Mod we have a different name for the scope and type of configs.  A proper config should use numbers for those entries. This is the same how arma configs are written.  The basicDefines.hpp has all the needed information stored.

Also, this removes the weight entries from the magazines since we have them in a separate folder, so admins can edit them.
This commit is contained in:
A Man
2020-05-29 02:04:06 +02:00
parent 4040b784b5
commit d9b9874532
291 changed files with 3439 additions and 3069 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp
View File

@@ -1,9 +1,8 @@
class ItemAntibiotic_base : CA_Magazine
{
scope = private;
scope = 0;
count = 1;
type = WeaponSlotItem;
type = 256;
model = "\dayz_equip\models\med_antibiotic_gear.p3d";
picture = "\dayz_equip\textures\equip_antibiotics_ca.paa";
displayName = $STR_EQUIP_NAME_17;
@@ -11,7 +10,7 @@ class ItemAntibiotic_base : CA_Magazine
class ItemAntibiotic : ItemAntibiotic_base
{
scope = public;
scope = 2;
descriptionShort = $STR_EQUIP_DESC_17;
class medical
@@ -109,7 +108,7 @@ class ItemAntibiotic1 : ItemAntibiotic
class ItemAntibioticEmpty : ItemAntibiotic_base
{
scope = public;
scope = 2;
displayName = $STR_EQUIP_NAME_ANTIBIOTICS_EMPTY;
descriptionShort = $STR_EQUIP_DESC_54;
};

61
SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp
View File

@@ -1,15 +1,14 @@
class bloodBagBase : CA_Magazine
{
scope = private;
scope = 0;
count = 1;
type = WeaponSlotItem;
type = 256;
picture = "\z\addons\dayz_communityassets\pictures\equip_bbag_full_ca.paa";
};
class bloodBagANEG : bloodBagBase
{
scope = public;
scope = 2;
displayName = $STR_BLD_name_bloodBagANEG;
model = "z\addons\dayz_communityassets\models\bbag_full_m_A.p3d";
descriptionShort = $STR_BLD_desc_bloodBagANEG;
@@ -17,7 +16,7 @@ class bloodBagANEG : bloodBagBase
class bloodBagAPOS : bloodBagBase
{
scope = public;
scope = 2;
displayName = $STR_BLD_name_bloodBagAPOS;
model = "z\addons\dayz_communityassets\models\bbag_full_p_A.p3d";
descriptionShort = $STR_BLD_desc_bloodBagAPOS;
@@ -25,7 +24,7 @@ class bloodBagAPOS : bloodBagBase
class bloodBagBNEG : bloodBagBase
{
scope = public;
scope = 2;
displayName = $STR_BLD_name_bloodBagBNEG;
model = "z\addons\dayz_communityassets\models\bbag_full_m_B.p3d";
descriptionShort = $STR_BLD_desc_bloodBagBNEG;
@@ -33,7 +32,7 @@ class bloodBagBNEG : bloodBagBase
class bloodBagBPOS : bloodBagBase
{
scope = public;
scope = 2;
displayName = $STR_BLD_name_bloodBagBPOS;
model = "z\addons\dayz_communityassets\models\bbag_full_p_B.p3d";
descriptionShort = $STR_BLD_desc_bloodBagBPOS;
@@ -41,7 +40,7 @@ class bloodBagBPOS : bloodBagBase
class bloodBagABNEG : bloodBagBase
{
scope = public;
scope = 2;
displayName = $STR_BLD_name_bloodBagABNEG;
model = "z\addons\dayz_communityassets\models\bbag_full_m_AB.p3d";
descriptionShort = $STR_BLD_desc_bloodBagABNEG;
@@ -49,7 +48,7 @@ class bloodBagABNEG : bloodBagBase
class bloodBagABPOS : bloodBagBase
{
scope = public;
scope = 2;
displayName = $STR_BLD_name_bloodBagABPOS;
model = "z\addons\dayz_communityassets\models\bbag_full_p_AB.p3d";
descriptionShort = $STR_BLD_desc_bloodBagABPOS;
@@ -57,7 +56,7 @@ class bloodBagABPOS : bloodBagBase
class bloodBagONEG : bloodBagBase
{
scope = public;
scope = 2;
displayName = $STR_BLD_name_bloodBagONEG;
model = "z\addons\dayz_communityassets\models\bbag_full_m_O.p3d";
descriptionShort = $STR_BLD_desc_bloodBagONEG;
@@ -65,7 +64,7 @@ class bloodBagONEG : bloodBagBase
class bloodBagOPOS : bloodBagBase
{
scope = public;
scope = 2;
displayName = $STR_BLD_name_bloodBagOPOS;
model = "z\addons\dayz_communityassets\models\bbag_full_p_O.p3d";
descriptionShort = $STR_BLD_desc_bloodBagOPOS;
@@ -86,56 +85,56 @@ class wholeBloodBagBase : bloodBagBase
class wholeBloodBagANEG : wholeBloodBagBase
{
scope = public;
scope = 2;
displayName = $STR_BLD_name_wholeBloodBagANEG;
model = "z\addons\dayz_communityassets\models\bbag_full_m_A.p3d";
descriptionShort = $STR_BLD_desc_wholeBloodBagANEG;
};
class wholeBloodBagAPOS : wholeBloodBagBase
{
scope = public;
scope = 2;
displayName = $STR_BLD_name_wholeBloodBagAPOS;
model = "z\addons\dayz_communityassets\models\bbag_full_p_A.p3d";
descriptionShort = $STR_BLD_desc_wholeBloodBagAPOS;
};
class wholeBloodBagBNEG : wholeBloodBagBase
{
scope = public;
scope = 2;
displayName = $STR_BLD_name_wholeBloodBagBNEG;
model = "z\addons\dayz_communityassets\models\bbag_full_m_B.p3d";
descriptionShort = $STR_BLD_desc_wholeBloodBagBNEG;
};
class wholeBloodBagBPOS : wholeBloodBagBase
{
scope = public;
scope = 2;
displayName = $STR_BLD_name_wholeBloodBagBPOS;
model = "z\addons\dayz_communityassets\models\bbag_full_p_B.p3d";
descriptionShort = $STR_BLD_desc_wholeBloodBagBPOS;
};
class wholeBloodBagABNEG : wholeBloodBagBase
{
scope = public;
scope = 2;
displayName = $STR_BLD_name_wholeBloodBagABNEG;
model = "z\addons\dayz_communityassets\models\bbag_full_m_AB.p3d";
descriptionShort = $STR_BLD_desc_wholeBloodBagABNEG;
};
class wholeBloodBagABPOS : wholeBloodBagBase
{
scope = public;
scope = 2;
displayName = $STR_BLD_name_wholeBloodBagABPOS;
model = "z\addons\dayz_communityassets\models\bbag_full_p_AB.p3d";
descriptionShort = $STR_BLD_desc_wholeBloodBagABPOS;
};
class wholeBloodBagONEG : wholeBloodBagBase
{
scope = public;
scope = 2;
displayName = $STR_BLD_name_wholeBloodBagONEG;
model = "z\addons\dayz_communityassets\models\bbag_full_m_O.p3d";
descriptionShort = $STR_BLD_desc_wholeBloodBagONEG;
};
class wholeBloodBagOPOS : wholeBloodBagBase
{
scope = public;
scope = 2;
displayName = $STR_BLD_name_wholeBloodBagOPOS;
model = "z\addons\dayz_communityassets\models\bbag_full_p_O.p3d";
descriptionShort = $STR_BLD_desc_wholeBloodBagOPOS;
@@ -144,10 +143,9 @@ class wholeBloodBagOPOS : wholeBloodBagBase
//MISC tools needed
class bloodTester : CA_Magazine
{
scope = public;
scope = 2;
count = 1;
type = WeaponSlotItem;
type = 256;
model = "z\addons\dayz_communityassets\models\blood_test.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_blood_test_ca.paa";
displayName = $STR_BLD_name_bloodTester;
@@ -165,10 +163,9 @@ class bloodTester : CA_Magazine
class transfusionKit : CA_Magazine
{
scope = public;
scope = 2;
count = 1;
type = WeaponSlotItem;
type = 256;
model = "z\addons\dayz_communityassets\models\blood_transfuse.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_bloodbag_transfuse_CA.paa";
displayName = $STR_BLD_name_transfusionKit;
@@ -186,10 +183,9 @@ class transfusionKit : CA_Magazine
class emptyBloodBag : CA_Magazine
{
scope = public;
scope = 2;
count = 1;
type = WeaponSlotItem;
type = 256;
model = "z\addons\dayz_communityassets\models\bbag_empty.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_bbag_empty_ca.paa";
displayName = $STR_BLD_name_emptyBloodBag;
@@ -208,15 +204,18 @@ class emptyBloodBag : CA_Magazine
//Classic blood bag
class ItemBloodbag: CA_Magazine
{
scope = public;
scope = 2;
count = 1;
type = 256;
displayName = "$STR_EQUIP_NAME_16";
model = "\dayz_equip\models\bloodbag.p3d";
picture = "\dayz_equip\textures\equip_bloodbag_ca.paa";
descriptionShort = "$STR_EQUIP_DESC_16";
class ItemActions {
class use {
class ItemActions
{
class Use
{
text = $STR_BLD_use;
script = "spawn player_useMeds;";
};

54
SQF/dayz_code/Configs/CfgMagazines/Medical/Medical.hpp
View File

@@ -4,10 +4,9 @@
class ItemAntibacterialWipe : CA_Magazine
{
scope = public;
scope = 2;
count = 1;
type = WeaponSlotHandGunItem;
type = 16;
model = "\z\addons\dayz_communityassets\models\antiseptic.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_antiseptic_ca.paa";
displayName = $STR_ITEM_NAME_WIPES;
@@ -25,10 +24,9 @@ class ItemAntibacterialWipe : CA_Magazine
class ItemBandage : CA_Magazine
{
scope = public;
scope = 2;
count = 1;
type = WeaponSlotHandGunItem;
type = 16;
model = "\dayz_equip\models\fad.p3d";
picture = "\dayz_equip\textures\equip_fad_ca.paa";
displayName = $STR_EQUIP_NAME_7;
@@ -56,10 +54,9 @@ class ItemBandage : CA_Magazine
class ItemSepsisBandage : CA_Magazine
{
scope = public;
scope = 2;
count = 1;
type = WeaponSlotHandGunItem;
type = 16;
model = "\dayz_equip\models\fad.p3d";
picture = "\dayz_equip\textures\equip_fad_ca.paa";
displayName = $STR_EQUIP_NAME_SEPSISBANDAGE;
@@ -77,10 +74,9 @@ class ItemSepsisBandage : CA_Magazine
class ItemEpinephrine : CA_Magazine
{
scope = public;
scope = 2;
count = 1;
type = WeaponSlotItem;
type = 256;
model = "\dayz_equip\models\epi.p3d";
picture = "\dayz_equip\textures\equip_epi_ca.paa";
displayName = $STR_EQUIP_NAME_14;
@@ -89,10 +85,9 @@ class ItemEpinephrine : CA_Magazine
class ItemMorphine : CA_Magazine
{
scope = public;
scope = 2;
count = 1;
type = WeaponSlotItem;
type = 256;
model = "\dayz_equip\models\morphine.p3d";
picture = "\dayz_equip\textures\equip_morphine_ca.paa";
displayName = $STR_EQUIP_NAME_15;
@@ -110,10 +105,9 @@ class ItemMorphine : CA_Magazine
class ItemHeatPack : CA_Magazine
{
scope = public;
scope = 2;
count = 1;
type = WeaponSlotItem;
type = 256;
model = "\dayz_equip\models\Heat_pack.p3d";
picture = "\dayz_equip\textures\equip_heat_pack_ca.paa";
displayName = $STR_EQUIP_NAME_42;
@@ -130,7 +124,7 @@ class ItemHeatPack : CA_Magazine
};
class equip_woodensplint : CA_Magazine {
scope = public;
scope = 2;
count = 1;
displayName = $STR_ITEM_NAME_WOODENSPLINT;
descriptionShort = $STR_ITEM_DESC_WOODENSPLINT;
@@ -138,16 +132,19 @@ class equip_woodensplint : CA_Magazine {
picture = "\z\addons\dayz_communityassets\pictures\equip_woodensplint_ca.paa";
type = 256;
class ItemActions {
class Use {
class ItemActions
{
class Use
{
text = $STR_ACTIONS_BRACE_LEG;
script = "spawn player_useMeds;";
};
};
};
class equip_gauze : CA_Magazine {
scope = public;
class equip_gauze : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_ITEM_NAME_equip_gauze;
descriptionShort = $STR_ITEM_DESC_equip_gauze;
@@ -170,8 +167,9 @@ class equip_gauze : CA_Magazine {
};
};
class equip_gauzepackaged : CA_Magazine {
scope = public;
class equip_gauzepackaged : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_ITEM_NAME_equip_gauzepackaged;
descriptionShort = $STR_ITEM_DESC_equip_gauzepackaged;
@@ -194,9 +192,11 @@ class equip_gauzepackaged : CA_Magazine {
};
};
class equip_herb_box : CA_Magazine {
scope = public;
class equip_herb_box : CA_Magazine
{
scope = 2;
count = 1;
type = 256;
displayName = $STR_EQUIP_NAME_HERBBOX;
descriptionShort = $STR_EQUIP_DESC_HERBBOX;
model = "\z\addons\dayz_communityassets\models\herb_box.p3d";

10
SQF/dayz_code/Configs/CfgMagazines/Medical/Painkiller.hpp
View File

@@ -1,9 +1,8 @@
class ItemPainkiller : CA_Magazine
{
scope = public;
scope = 2;
count = 1;
type = WeaponSlotItem;
type = 256;
model = "\dayz_equip\models\med_painkiller_gear.p3d";
picture = "\dayz_equip\textures\equip_painkiller_ca.paa";
displayName = $STR_EQUIP_NAME_18;
@@ -104,12 +103,11 @@ class ItemPainkiller1 : ItemPainkiller
class ItemPainkillerEmpty : CA_Magazine
{
scope = public;
scope = 2;
displayName = $STR_EQUIP_NAME_PAINKILLER_EMPTY;
descriptionShort = $STR_EQUIP_DESC_PAINKILLER_EMPTY;
count = 1;
type = WeaponSlotItem;
type = 256;
model = "\dayz_equip\models\med_painkiller_gear.p3d";
picture = "\dayz_equip\textures\equip_painkiller_ca.paa";
};