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

206
SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp
View File

@@ -1,7 +1,6 @@
class ItemWaterBottle : FoodDrink
{
scope = public;
scope = 2;
model = "\dayz_equip\models\waterbottle_gear.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle10oz_ca.paa";
displayName = $STR_EQUIP_NAME_12;
@@ -43,8 +42,7 @@ class ItemWaterBottleSafe : ItemWaterBottle
class ItemWaterBottleBoiled : ItemWaterBottle
{
displayName = $STR_ITEMWATERBOTTLEBOILED_CODE_NAME;
descriptionShort = $STR_ITEMWATERBOTTLEBOILED_CODE_DESC;
descriptionShort = $STR_ITEMWATERBOTTLEBOILED_CODE_DESC;
infectionChance = 0;
class ItemActions
@@ -69,22 +67,19 @@ class ItemWaterBottleBoiled : ItemWaterBottle
class ItemWaterBottleHerbal : ItemWaterBottle
{
displayName = $STR_ITEM_NAME_HerbalDrink;
descriptionShort = $STR_ITEM_DESC_HerbalDrink;
descriptionShort = $STR_ITEM_DESC_HerbalDrink;
infectionChance = -0.5;
};
class ItemWaterBottleUnfilled : CA_Magazine
{
scope = public;
scope = 2;
count = 1;
type = WeaponSlotItem;
type = 256;
model = "\dayz_equip\models\waterbottle_gear.p3d";
picture = "\dayz_equip\textures\equip_waterbottle_empty_ca.paa";
displayName = $STR_EQUIP_NAME_13;
descriptionShort = $STR_EQUIP_DESC_13;
descriptionShort = $STR_EQUIP_DESC_13;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
@@ -101,10 +96,9 @@ class ItemWaterBottleUnfilled : CA_Magazine
class ItemWaterBottleDmg : CA_Magazine //We don't have a damaged canteen image/model , so the regular bottle image is used for now
{
scope = public;
scope = 2;
count = 1;
type = WeaponSlotItem;
type = 256;
model = "\dayz_equip\models\waterbottle_gear.p3d";
picture = "\dayz_equip\textures\equip_waterbottle_empty_ca.paa";
displayName = $STR_ITEMWATERBOTTLEDMG_CODE_NAME;
@@ -113,7 +107,8 @@ class ItemWaterBottleDmg : CA_Magazine //We don't have a damaged canteen image/m
class ItemActions
{
class Crafting {
class Crafting
{
text = $STR_ACTIONS_FIX_W;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
@@ -124,7 +119,8 @@ class ItemWaterBottleDmg : CA_Magazine //We don't have a damaged canteen image/m
};
};
class ItemWaterbottle1oz : ItemWaterbottle {
class ItemWaterbottle1oz : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE1OZ;
descriptionShort = $STR_EPOCH_WATERBOTTLE1OZ_DESC;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_1oz_ca.paa";
@@ -136,7 +132,9 @@ class ItemWaterbottle1oz : ItemWaterbottle {
infectionChance = 0.03;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -147,13 +145,15 @@ class ItemWaterbottle1oz : 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 ItemWaterbottle2oz : ItemWaterbottle {
class ItemWaterbottle2oz : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE2OZ;
descriptionShort = $STR_EPOCH_WATERBOTTLE2OZ_DESC;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_2oz_ca.paa";
@@ -165,7 +165,9 @@ class ItemWaterbottle2oz : ItemWaterbottle {
infectionChance = 0.06;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -176,14 +178,16 @@ class ItemWaterbottle2oz : 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 ItemWaterbottle3oz : ItemWaterbottle {
class ItemWaterbottle3oz : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE3OZ;
descriptionShort = $STR_EPOCH_WATERBOTTLE3OZ_DESC;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_3oz_ca.paa";
@@ -195,7 +199,9 @@ class ItemWaterbottle3oz : ItemWaterbottle {
infectionChance = 0.09;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -206,14 +212,16 @@ class ItemWaterbottle3oz : 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 ItemWaterbottle4oz : ItemWaterbottle {
class ItemWaterbottle4oz : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE4OZ;
descriptionShort = $STR_EPOCH_WATERBOTTLE4OZ_DESC;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_4oz_ca.paa";
@@ -225,7 +233,9 @@ class ItemWaterbottle4oz : ItemWaterbottle {
infectionChance = 0.12;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -236,14 +246,16 @@ class ItemWaterbottle4oz : 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 ItemWaterbottle5oz : ItemWaterbottle {
class ItemWaterbottle5oz : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE5OZ;
descriptionShort = $STR_EPOCH_WATERBOTTLE5OZ_DESC;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_5oz_ca.paa";
@@ -255,7 +267,9 @@ class ItemWaterbottle5oz : ItemWaterbottle {
infectionChance = 0.15;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -266,14 +280,16 @@ class ItemWaterbottle5oz : 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 ItemWaterbottle6oz : ItemWaterbottle {
class ItemWaterbottle6oz : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE6OZ;
descriptionShort = $STR_EPOCH_WATERBOTTLE6OZ_DESC;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_6oz_ca.paa";
@@ -285,7 +301,9 @@ class ItemWaterbottle6oz : ItemWaterbottle {
infectionChance = 0.18;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -296,14 +314,16 @@ class ItemWaterbottle6oz : 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 ItemWaterbottle7oz : ItemWaterbottle {
class ItemWaterbottle7oz : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE7OZ;
descriptionShort = $STR_EPOCH_WATERBOTTLE7OZ_DESC;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_7oz_ca.paa";
@@ -315,7 +335,9 @@ class ItemWaterbottle7oz : ItemWaterbottle {
infectionChance = 0.21;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -326,13 +348,15 @@ class ItemWaterbottle7oz : 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 ItemWaterbottle8oz : ItemWaterbottle {
class ItemWaterbottle8oz : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE8OZ;
descriptionShort = $STR_EPOCH_WATERBOTTLE8OZ_DESC;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_8oz_ca.paa";
@@ -344,7 +368,9 @@ class ItemWaterbottle8oz : ItemWaterbottle {
infectionChance = 0.24;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -355,14 +381,16 @@ class ItemWaterbottle8oz : 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 ItemWaterbottle9oz : ItemWaterbottle {
class ItemWaterbottle9oz : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE9OZ;
descriptionShort = $STR_EPOCH_WATERBOTTLE9OZ_DESC;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_9oz_ca.paa";
@@ -374,7 +402,9 @@ class ItemWaterbottle9oz : ItemWaterbottle {
infectionChance = 0.27;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -385,14 +415,17 @@ class ItemWaterbottle9oz : 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 ItemWaterbottle1ozBoiled : ItemWaterbottle {
class ItemWaterbottle1ozBoiled : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE1OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE1OZBOILED_DESC;
infectionChance = 0;
@@ -404,7 +437,9 @@ class ItemWaterbottle1ozBoiled : ItemWaterbottle {
Nutrition[] = {0,0,100,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -415,13 +450,15 @@ class ItemWaterbottle1ozBoiled : 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 ItemWaterbottle2ozBoiled : ItemWaterbottle {
class ItemWaterbottle2ozBoiled : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE2OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE2OZBOILED_DESC;
infectionChance = 0;
@@ -433,7 +470,9 @@ class ItemWaterbottle2ozBoiled : ItemWaterbottle {
Nutrition[] = {0,0,200,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -444,13 +483,15 @@ class ItemWaterbottle2ozBoiled : 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 ItemWaterbottle3ozBoiled : ItemWaterbottle {
class ItemWaterbottle3ozBoiled : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE3OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE3OZBOILED_DESC;
infectionChance = 0;
@@ -462,7 +503,9 @@ class ItemWaterbottle3ozBoiled : ItemWaterbottle {
Nutrition[] = {0,0,300,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -473,13 +516,15 @@ class ItemWaterbottle3ozBoiled : 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 ItemWaterbottle4ozBoiled : ItemWaterbottle {
class ItemWaterbottle4ozBoiled : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE4OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE4OZBOILED_DESC;
infectionChance = 0;
@@ -491,7 +536,9 @@ class ItemWaterbottle4ozBoiled : ItemWaterbottle {
Nutrition[] = {0,0,400,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -502,13 +549,15 @@ class ItemWaterbottle4ozBoiled : 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 ItemWaterbottle5ozBoiled : ItemWaterbottle {
class ItemWaterbottle5ozBoiled : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE5OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE5OZBOILED_DESC;
infectionChance = 0;
@@ -520,7 +569,9 @@ class ItemWaterbottle5ozBoiled : ItemWaterbottle {
Nutrition[] = {0,0,500,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -531,13 +582,15 @@ class ItemWaterbottle5ozBoiled : 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 ItemWaterbottle6ozBoiled : ItemWaterbottle {
class ItemWaterbottle6ozBoiled : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE6OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE6OZBOILED_DESC;
infectionChance = 0;
@@ -549,7 +602,9 @@ class ItemWaterbottle6ozBoiled : ItemWaterbottle {
Nutrition[] = {0,0,600,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -560,13 +615,15 @@ class ItemWaterbottle6ozBoiled : 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 ItemWaterbottle7ozBoiled : ItemWaterbottle {
class ItemWaterbottle7ozBoiled : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE7OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE7OZBOILED_DESC;
infectionChance = 0;
@@ -578,7 +635,9 @@ class ItemWaterbottle7ozBoiled : ItemWaterbottle {
Nutrition[] = {0,0,700,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -589,13 +648,15 @@ class ItemWaterbottle7ozBoiled : 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 ItemWaterbottle8ozBoiled : ItemWaterbottle {
class ItemWaterbottle8ozBoiled : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE8OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE8OZBOILED_DESC;
infectionChance = 0;
@@ -607,7 +668,9 @@ class ItemWaterbottle8ozBoiled : ItemWaterbottle {
Nutrition[] = {0,0,800,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -618,13 +681,15 @@ class ItemWaterbottle8ozBoiled : 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 ItemWaterbottle9ozBoiled : ItemWaterbottle {
class ItemWaterbottle9ozBoiled : ItemWaterbottle
{
displayName = $STR_EPOCH_WATERBOTTLE9OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE9OZBOILED_DESC;
infectionChance = 0;
@@ -636,7 +701,9 @@ class ItemWaterbottle9ozBoiled : ItemWaterbottle {
Nutrition[] = {0,0,900,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions {
class ItemActions
{
class Consume
{
text = $STR_ACTIONS_DRINK2;
@@ -647,7 +714,8 @@ class ItemWaterbottle9ozBoiled : ItemWaterbottle {
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill {
class Fill
{
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};