W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add drinking and emptying of < 10 oz wattter

Browse Source 
Amount of water and infection chance are proportional to the amount of
water.
This commit is contained in:
icomrade
2016-07-21 15:36:55 -04:00
parent 67f6d86440
commit 3519297e2d
1 changed files with 132 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
SQF/dayz_code/Configs/CfgMagazines/DZE/ItemWaterbottle.hpp
View File

@@ -6,7 +6,21 @@ class ItemWaterbottle1oz : ItemWaterbottle {
containerWater = "ItemWaterBottle"; containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe"; containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected"; containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,100,0};
infectionChance = 0.03;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions { class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill { class Fill {
text = "$STR_ACTIONS_FILL_W"; text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;"; script = "spawn player_fillWater;";
@@ -21,12 +35,27 @@ class ItemWaterbottle2oz : ItemWaterbottle {
containerWater = "ItemWaterBottle"; containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe"; containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected"; containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,200,0};
infectionChance = 0.06;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions { class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill { class Fill {
text = "$STR_ACTIONS_FILL_W"; text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;"; script = "spawn player_fillWater;";
}; };
}; };
}; };
class ItemWaterbottle3oz : ItemWaterbottle { class ItemWaterbottle3oz : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE3OZ; displayName = $STR_EPOCH_WATERBOTTLE3OZ;
@@ -36,12 +65,27 @@ class ItemWaterbottle3oz : ItemWaterbottle {
containerWater = "ItemWaterBottle"; containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe"; containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected"; containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,300,0};
infectionChance = 0.09;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions { class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill { class Fill {
text = "$STR_ACTIONS_FILL_W"; text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;"; script = "spawn player_fillWater;";
}; };
}; };
}; };
class ItemWaterbottle4oz : ItemWaterbottle { class ItemWaterbottle4oz : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE4OZ; displayName = $STR_EPOCH_WATERBOTTLE4OZ;
@@ -51,12 +95,27 @@ class ItemWaterbottle4oz : ItemWaterbottle {
containerWater = "ItemWaterBottle"; containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe"; containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected"; containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,400,0};
infectionChance = 0.12;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions { class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill { class Fill {
text = "$STR_ACTIONS_FILL_W"; text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;"; script = "spawn player_fillWater;";
}; };
}; };
}; };
class ItemWaterbottle5oz : ItemWaterbottle { class ItemWaterbottle5oz : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE5OZ; displayName = $STR_EPOCH_WATERBOTTLE5OZ;
@@ -66,12 +125,27 @@ class ItemWaterbottle5oz : ItemWaterbottle {
containerWater = "ItemWaterBottle"; containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe"; containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected"; containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,500,0};
infectionChance = 0.15;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions { class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill { class Fill {
text = "$STR_ACTIONS_FILL_W"; text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;"; script = "spawn player_fillWater;";
}; };
}; };
}; };
class ItemWaterbottle6oz : ItemWaterbottle { class ItemWaterbottle6oz : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE6OZ; displayName = $STR_EPOCH_WATERBOTTLE6OZ;
@@ -81,12 +155,27 @@ class ItemWaterbottle6oz : ItemWaterbottle {
containerWater = "ItemWaterBottle"; containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe"; containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected"; containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,600,0};
infectionChance = 0.18;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions { class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill { class Fill {
text = "$STR_ACTIONS_FILL_W"; text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;"; script = "spawn player_fillWater;";
}; };
}; };
}; };
class ItemWaterbottle7oz : ItemWaterbottle { class ItemWaterbottle7oz : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE7OZ; displayName = $STR_EPOCH_WATERBOTTLE7OZ;
@@ -96,7 +185,21 @@ class ItemWaterbottle7oz : ItemWaterbottle {
containerWater = "ItemWaterBottle"; containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe"; containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected"; containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,700,0};
infectionChance = 0.21;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions { class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill { class Fill {
text = "$STR_ACTIONS_FILL_W"; text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;"; script = "spawn player_fillWater;";
@@ -111,12 +214,27 @@ class ItemWaterbottle8oz : ItemWaterbottle {
containerWater = "ItemWaterBottle"; containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe"; containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected"; containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,800,0};
infectionChance = 0.24;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions { class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill { class Fill {
text = "$STR_ACTIONS_FILL_W"; text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;"; script = "spawn player_fillWater;";
}; };
}; };
}; };
class ItemWaterbottle9oz : ItemWaterbottle { class ItemWaterbottle9oz : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE9OZ; displayName = $STR_EPOCH_WATERBOTTLE9OZ;
@@ -126,7 +244,21 @@ class ItemWaterbottle9oz : ItemWaterbottle {
containerWater = "ItemWaterBottle"; containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe"; containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected"; containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,900,0};
infectionChance = 0.27;
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
class ItemActions { class ItemActions {
class Consume
{
text = $STR_ACTIONS_DRINK2;
script = "spawn player_consume";
};
class Empty
{
text = $STR_EQUIP_NAME_13_EMPTY;
script = "spawn player_emptyContainer";
};
class Fill { class Fill {
text = "$STR_ACTIONS_FILL_W"; text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;"; script = "spawn player_fillWater;";