Handle boiled waterbottles < 10oz

should fix #1838 Translation fixes are probably necessary
This commit is contained in:
icomrade
2016-12-29 15:50:53 -05:00
parent 3176e1619d
commit c64c181f95
6 changed files with 399 additions and 30 deletions

View File

@@ -264,4 +264,266 @@ class ItemWaterbottle9oz : ItemWaterbottle {
script = "spawn player_fillWater;";
};
};
};
};
//inherit from ItemWaterbottle because that's how the crafting script checks required input
class ItemWaterbottle1ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE1OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE1OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_1oz_ca.paa";
wateroz = 1;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,100,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
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 {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemWaterbottle2ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE2OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE2OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_2oz_ca.paa";
wateroz = 2;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,200,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
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 {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemWaterbottle3ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE3OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE3OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_3oz_ca.paa";
wateroz = 3;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,300,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
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 {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemWaterbottle4ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE4OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE4OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_4oz_ca.paa";
wateroz = 4;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,400,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
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 {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemWaterbottle5ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE5OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE5OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_5oz_ca.paa";
wateroz = 5;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,500,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
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 {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemWaterbottle6ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE6OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE6OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_6oz_ca.paa";
wateroz = 6;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,600,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
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 {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemWaterbottle7ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE7OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE7OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_7oz_ca.paa";
wateroz = 7;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,700,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
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 {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemWaterbottle8ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE8OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE8OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_8oz_ca.paa";
wateroz = 8;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,800,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
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 {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};
class ItemWaterbottle9ozBoiled : ItemWaterbottle {
displayName = $STR_EPOCH_WATERBOTTLE9OZBOILED;
descriptionShort = $STR_EPOCH_WATERBOTTLE9OZBOILED_DESC;
infectionChance = 0;
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle_9oz_ca.paa";
wateroz = 9;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";
Nutrition[] = {0,0,900,0};
consumeOutput = "ItemWaterBottleUnfilled";
containerEmpty = "ItemWaterBottleUnfilled";
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 {
text = "$STR_ACTIONS_FILL_W";
script = "spawn player_fillWater;";
};
};
};