W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-15 21:29:59 +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

208
SQF/dayz_code/Configs/CfgMagazines/Consumables/PlasticWaterbottle.hpp
View File

@@ -1,9 +1,8 @@
class ItemPlasticWaterbottleUnfilled : CA_Magazine
{
scope = public;
scope = 2;
count = 1;
type = WeaponSlotItem;
type = 256;
model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottleEmpty.paa";
displayName = $STR_EQUIP_NAME_WBPET_01;
@@ -25,10 +24,9 @@ class ItemPlasticWaterbottleUnfilled : CA_Magazine
class ItemPlasticWaterbottleDmg : CA_Magazine
{
scope = public;
scope = 2;
count = 1;
type = WeaponSlotItem;
type = 256;
model = "z\addons\dayz_communityassets\models\waterbottle_damaged.p3d";
picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottleDamaged.paa";
displayName = $STR_EQUIP_NAME_WBPET_02;
@@ -37,7 +35,8 @@ class ItemPlasticWaterbottleDmg : CA_Magazine
class ItemActions
{
class Crafting {
class Crafting
{
text = $STR_ACTIONS_FIX_W;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
@@ -48,15 +47,15 @@ class ItemPlasticWaterbottleDmg : CA_Magazine
};
};
class ItemPlasticWaterBottle : ItemWaterBottle {
scope = public;
class ItemPlasticWaterBottle : ItemWaterBottle
{
scope = 2;
model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle10oz.paa";
displayName = $STR_EQUIP_NAME_WBPET_03;
descriptionShort = $STR_EQUIP_DESC_WBPET_03;
Nutrition[] = {0,0,1000,0};
infectionChance = 0.3;
infectionChance = 0.3;
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
};
@@ -88,8 +87,7 @@ class ItemPlasticWaterBottleBoiled : ItemWaterBottle
model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle10oz.paa";
displayName = $STR_EQUIP_NAME_WBPET_04;
descriptionShort = $STR_EQUIP_DESC_WBPET_04;
descriptionShort = $STR_EQUIP_DESC_WBPET_04;
infectionChance = 0;
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
@@ -118,14 +116,14 @@ class ItemPlasticWaterBottleHerbal : ItemWaterBottle
model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle10oz.paa";
displayName = $STR_EQUIP_NAME_WBPET_05;
descriptionShort = $STR_EQUIP_DESC_WBPET_05;
descriptionShort = $STR_EQUIP_DESC_WBPET_05;
infectionChance = -0.5;
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
};
class ItemPlasticWaterbottle1oz : ItemWaterBottle {
class ItemPlasticWaterbottle1oz : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE1OZ;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE1OZ_DESC;
model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
@@ -138,7 +136,9 @@ class ItemPlasticWaterbottle1oz : ItemWaterBottle {
infectionChance = 0.03;
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -149,13 +149,15 @@ class ItemPlasticWaterbottle1oz : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemPlasticWaterbottle2oz : ItemWaterBottle {
class ItemPlasticWaterbottle2oz : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE2OZ;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE2OZ_DESC;
model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
@@ -168,7 +170,9 @@ class ItemPlasticWaterbottle2oz : ItemWaterBottle {
infectionChance = 0.06;
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -179,14 +183,16 @@ class ItemPlasticWaterbottle2oz : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemPlasticWaterbottle3oz : ItemWaterBottle {
class ItemPlasticWaterbottle3oz : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE3OZ;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE3OZ_DESC;
model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
@@ -199,7 +205,9 @@ class ItemPlasticWaterbottle3oz : ItemWaterBottle {
infectionChance = 0.09;
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -210,14 +218,16 @@ class ItemPlasticWaterbottle3oz : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemPlasticWaterbottle4oz : ItemWaterBottle {
class ItemPlasticWaterbottle4oz : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE4OZ;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE4OZ_DESC;
model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
@@ -230,7 +240,9 @@ class ItemPlasticWaterbottle4oz : ItemWaterBottle {
infectionChance = 0.12;
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -241,14 +253,16 @@ class ItemPlasticWaterbottle4oz : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemPlasticWaterbottle5oz : ItemWaterBottle {
class ItemPlasticWaterbottle5oz : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE5OZ;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE5OZ_DESC;
model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
@@ -261,7 +275,9 @@ class ItemPlasticWaterbottle5oz : ItemWaterBottle {
infectionChance = 0.15;
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -272,14 +288,16 @@ class ItemPlasticWaterbottle5oz : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemPlasticWaterbottle6oz : ItemWaterBottle {
class ItemPlasticWaterbottle6oz : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE6OZ;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE6OZ_DESC;
model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
@@ -292,7 +310,9 @@ class ItemPlasticWaterbottle6oz : ItemWaterBottle {
infectionChance = 0.18;
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -303,14 +323,16 @@ class ItemPlasticWaterbottle6oz : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemPlasticWaterbottle7oz : ItemWaterBottle {
class ItemPlasticWaterbottle7oz : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE7OZ;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE7OZ_DESC;
model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
@@ -323,7 +345,9 @@ class ItemPlasticWaterbottle7oz : ItemWaterBottle {
infectionChance = 0.21;
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -334,13 +358,15 @@ class ItemPlasticWaterbottle7oz : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemPlasticWaterbottle8oz : ItemWaterBottle {
class ItemPlasticWaterbottle8oz : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE8OZ;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE8OZ_DESC;
model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
@@ -353,7 +379,9 @@ class ItemPlasticWaterbottle8oz : ItemWaterBottle {
infectionChance = 0.24;
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -364,14 +392,16 @@ class ItemPlasticWaterbottle8oz : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemPlasticWaterbottle9oz : ItemWaterBottle {
class ItemPlasticWaterbottle9oz : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE9OZ;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE9OZ_DESC;
model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
@@ -384,7 +414,9 @@ class ItemPlasticWaterbottle9oz : ItemWaterBottle {
infectionChance = 0.27;
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -395,14 +427,17 @@ class ItemPlasticWaterbottle9oz : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
//inherit from ItemWaterBottle because that's how the crafting script checks required input
class ItemPlasticWaterbottle1ozBoiled : ItemWaterBottle {
class ItemPlasticWaterbottle1ozBoiled : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE1OZBOILED;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE1OZBOILED_DESC;
infectionChance = 0;
@@ -415,7 +450,9 @@ class ItemPlasticWaterbottle1ozBoiled : ItemWaterBottle {
Nutrition[] = {0,0,100,0};
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -426,13 +463,15 @@ class ItemPlasticWaterbottle1ozBoiled : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemPlasticWaterbottle2ozBoiled : ItemWaterBottle {
class ItemPlasticWaterbottle2ozBoiled : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE2OZBOILED;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE2OZBOILED_DESC;
infectionChance = 0;
@@ -445,7 +484,9 @@ class ItemPlasticWaterbottle2ozBoiled : ItemWaterBottle {
Nutrition[] = {0,0,200,0};
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -456,13 +497,15 @@ class ItemPlasticWaterbottle2ozBoiled : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemPlasticWaterbottle3ozBoiled : ItemWaterBottle {
class ItemPlasticWaterbottle3ozBoiled : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE3OZBOILED;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE3OZBOILED_DESC;
infectionChance = 0;
@@ -475,7 +518,9 @@ class ItemPlasticWaterbottle3ozBoiled : ItemWaterBottle {
Nutrition[] = {0,0,300,0};
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -486,13 +531,15 @@ class ItemPlasticWaterbottle3ozBoiled : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemPlasticWaterbottle4ozBoiled : ItemWaterBottle {
class ItemPlasticWaterbottle4ozBoiled : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE4OZBOILED;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE4OZBOILED_DESC;
infectionChance = 0;
@@ -505,7 +552,9 @@ class ItemPlasticWaterbottle4ozBoiled : ItemWaterBottle {
Nutrition[] = {0,0,400,0};
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -516,13 +565,15 @@ class ItemPlasticWaterbottle4ozBoiled : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemPlasticWaterbottle5ozBoiled : ItemWaterBottle {
class ItemPlasticWaterbottle5ozBoiled : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE5OZBOILED;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE5OZBOILED_DESC;
infectionChance = 0;
@@ -535,7 +586,9 @@ class ItemPlasticWaterbottle5ozBoiled : ItemWaterBottle {
Nutrition[] = {0,0,500,0};
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -546,13 +599,15 @@ class ItemPlasticWaterbottle5ozBoiled : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemPlasticWaterbottle6ozBoiled : ItemWaterBottle {
class ItemPlasticWaterbottle6ozBoiled : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE6OZBOILED;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE6OZBOILED_DESC;
infectionChance = 0;
@@ -565,7 +620,9 @@ class ItemPlasticWaterbottle6ozBoiled : ItemWaterBottle {
Nutrition[] = {0,0,600,0};
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -576,13 +633,15 @@ class ItemPlasticWaterbottle6ozBoiled : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemPlasticWaterbottle7ozBoiled : ItemWaterBottle {
class ItemPlasticWaterbottle7ozBoiled : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE7OZBOILED;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE7OZBOILED_DESC;
infectionChance = 0;
@@ -595,7 +654,9 @@ class ItemPlasticWaterbottle7ozBoiled : ItemWaterBottle {
Nutrition[] = {0,0,700,0};
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -606,13 +667,15 @@ class ItemPlasticWaterbottle7ozBoiled : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemPlasticWaterbottle8ozBoiled : ItemWaterBottle {
class ItemPlasticWaterbottle8ozBoiled : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE8OZBOILED;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE8OZBOILED_DESC;
infectionChance = 0;
@@ -625,7 +688,9 @@ class ItemPlasticWaterbottle8ozBoiled : ItemWaterBottle {
Nutrition[] = {0,0,800,0};
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -636,13 +701,15 @@ class ItemPlasticWaterbottle8ozBoiled : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemPlasticWaterbottle9ozBoiled : ItemWaterBottle {
class ItemPlasticWaterbottle9ozBoiled : ItemWaterBottle
{
displayName = $STR_EPOCH_PET_WATERBOTTLE9OZBOILED;
descriptionShort = $STR_EPOCH_PET_WATERBOTTLE9OZBOILED_DESC;
infectionChance = 0;
@@ -655,7 +722,9 @@ class ItemPlasticWaterbottle9ozBoiled : ItemWaterBottle {
Nutrition[] = {0,0,900,0};
consumeOutput = "ItemPlasticWaterbottleUnfilled";
containerEmpty = "ItemPlasticWaterbottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -666,7 +735,8 @@ class ItemPlasticWaterbottle9ozBoiled : ItemWaterBottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};