Streamline water bottle strings by @seelenapparat

Water bottles are sorted by the object model in the gear now.

Remove old canteen configs since it is in under pet waterbottle now.

SQF/dayz_code/Configs/CfgMagazines/DZE/PlasticWaterbottle.hpp

@@ -6,8 +6,8 @@ class ItemPlasticWaterbottleUnfilled : CA_Magazine
 	
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottleEmpty.paa";
-	displayName = $STR_EQUIP_NAME_13;
-	descriptionShort = $STR_EQUIP_DESC_13;
+	displayName = $STR_EQUIP_NAME_WBPET_01;
+	descriptionShort = $STR_EQUIP_DESC_WBPET_01;
 	
 	containerWater = "ItemPlasticWaterbottle";
 	containerWaterSafe = "ItemPlasticWaterbottleSafe";
@@ -30,9 +30,9 @@ class ItemPlasticWaterbottleDmg : CA_Magazine
 	type = WeaponSlotItem;
 	
 	model = "z\addons\dayz_communityassets\models\waterbottle_damaged.p3d";
-	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottleEmpty.paa";
-	displayName = $STR_ITEMWATERBOTTLEDMG_CODE_NAME;
-	descriptionShort = $STR_ITEMWATERBOTTLEDMG_CODE_DESC;
+	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottleDamaged.paa";
+	displayName = $STR_EQUIP_NAME_WBPET_02;
+	descriptionShort = $STR_EQUIP_DESC_WBPET_02;
 	
 	class ItemActions
 	{
@@ -48,7 +48,8 @@ class ItemPlasticWaterBottle : ItemWaterBottle {
 	scope = public;
 	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;
 	
@@ -61,7 +62,8 @@ class ItemPlasticWaterBottleInfected : ItemWaterBottle
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle10oz.paa";
 	infectionChance = 1;
-	
+	displayName = $STR_EQUIP_NAME_WBPET_03;
+	descriptionShort = $STR_EQUIP_DESC_WBPET_03;	
 	consumeOutput = "ItemPlasticWaterbottleUnfilled";	
 	containerEmpty = "ItemPlasticWaterbottleUnfilled";
 };
@@ -71,7 +73,8 @@ class ItemPlasticWaterBottleSafe : ItemWaterBottle
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle10oz.paa";
 	infectionChance = 0;
-	
+	displayName = $STR_EQUIP_NAME_WBPET_03;
+	descriptionShort = $STR_EQUIP_DESC_WBPET_03;	
 	consumeOutput = "ItemPlasticWaterbottleUnfilled";	
 	containerEmpty = "ItemPlasticWaterbottleUnfilled";
 };
@@ -80,8 +83,8 @@ class ItemPlasticWaterBottleBoiled : ItemWaterBottle
 {
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle10oz.paa";
-	displayName = $STR_ITEMWATERBOTTLEBOILED_CODE_NAME;
-	descriptionShort = $STR_ITEMWATERBOTTLEBOILED_CODE_DESC;
+	displayName = $STR_EQUIP_NAME_WBPET_04;
+	descriptionShort = $STR_EQUIP_DESC_WBPET_04;
 	
 	infectionChance = 0;
 	consumeOutput = "ItemPlasticWaterbottleUnfilled";	
@@ -92,8 +95,8 @@ class ItemPlasticWaterBottleHerbal : ItemWaterBottle
 {
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle10oz.paa";
-	displayName = $STR_ITEM_NAME_HerbalDrink;
-	descriptionShort = $STR_ITEM_DESC_HerbalDrink;
+	displayName = $STR_EQUIP_NAME_WBPET_05;
+	descriptionShort = $STR_EQUIP_DESC_WBPET_05;
 	
 	infectionChance = -0.5;
 	consumeOutput = "ItemPlasticWaterbottleUnfilled";	
@@ -101,8 +104,8 @@ class ItemPlasticWaterBottleHerbal : ItemWaterBottle
 };
 
 class ItemPlasticWaterbottle1oz : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE1OZ;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE1OZ_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE1OZ;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE1OZ_DESC;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle1oz.paa";
 	wateroz = 1;
@@ -131,8 +134,8 @@ class ItemPlasticWaterbottle1oz : ItemWaterBottle {
 	};
 };
 class ItemPlasticWaterbottle2oz : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE2OZ;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE2OZ_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE2OZ;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE2OZ_DESC;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle2oz.paa";
 	wateroz = 2;
@@ -162,8 +165,8 @@ class ItemPlasticWaterbottle2oz : ItemWaterBottle {
 
 };
 class ItemPlasticWaterbottle3oz : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE3OZ;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE3OZ_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE3OZ;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE3OZ_DESC;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle3oz.paa";
 	wateroz = 3;
@@ -193,8 +196,8 @@ class ItemPlasticWaterbottle3oz : ItemWaterBottle {
 
 };
 class ItemPlasticWaterbottle4oz : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE4OZ;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE4OZ_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE4OZ;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE4OZ_DESC;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle4oz.paa";
 	wateroz = 4;
@@ -224,8 +227,8 @@ class ItemPlasticWaterbottle4oz : ItemWaterBottle {
 
 };
 class ItemPlasticWaterbottle5oz : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE5OZ;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE5OZ_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE5OZ;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE5OZ_DESC;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle5oz.paa";
 	wateroz = 5;
@@ -255,8 +258,8 @@ class ItemPlasticWaterbottle5oz : ItemWaterBottle {
 
 };
 class ItemPlasticWaterbottle6oz : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE6OZ;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE6OZ_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE6OZ;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE6OZ_DESC;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle6oz.paa";
 	wateroz = 6;
@@ -286,8 +289,8 @@ class ItemPlasticWaterbottle6oz : ItemWaterBottle {
 
 };
 class ItemPlasticWaterbottle7oz : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE7OZ;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE7OZ_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE7OZ;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE7OZ_DESC;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle7oz.paa";
 	wateroz = 7;
@@ -316,8 +319,8 @@ class ItemPlasticWaterbottle7oz : ItemWaterBottle {
 	};
 };
 class ItemPlasticWaterbottle8oz : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE8OZ;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE8OZ_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE8OZ;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE8OZ_DESC;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle8oz.paa";
 	wateroz = 8;
@@ -347,8 +350,8 @@ class ItemPlasticWaterbottle8oz : ItemWaterBottle {
 
 };
 class ItemPlasticWaterbottle9oz : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE9OZ;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE9OZ_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE9OZ;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE9OZ_DESC;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle9oz.paa";
 	wateroz = 9;
@@ -378,8 +381,8 @@ class ItemPlasticWaterbottle9oz : ItemWaterBottle {
 };
 //inherit from ItemWaterBottle because that's how the crafting script checks required input
 class ItemPlasticWaterbottle1ozBoiled : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE1OZBOILED;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE1OZBOILED_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE1OZBOILED;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE1OZBOILED_DESC;
 	infectionChance = 0;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle1oz.paa";
@@ -408,8 +411,8 @@ class ItemPlasticWaterbottle1ozBoiled : ItemWaterBottle {
 	};
 };
 class ItemPlasticWaterbottle2ozBoiled : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE2OZBOILED;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE2OZBOILED_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE2OZBOILED;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE2OZBOILED_DESC;
 	infectionChance = 0;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle2oz.paa";
@@ -438,8 +441,8 @@ class ItemPlasticWaterbottle2ozBoiled : ItemWaterBottle {
 	};
 };
 class ItemPlasticWaterbottle3ozBoiled : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE3OZBOILED;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE3OZBOILED_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE3OZBOILED;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE3OZBOILED_DESC;
 	infectionChance = 0;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle3oz.paa";
@@ -468,8 +471,8 @@ class ItemPlasticWaterbottle3ozBoiled : ItemWaterBottle {
 	};
 };
 class ItemPlasticWaterbottle4ozBoiled : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE4OZBOILED;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE4OZBOILED_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE4OZBOILED;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE4OZBOILED_DESC;
 	infectionChance = 0;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle4oz.paa";
@@ -498,8 +501,8 @@ class ItemPlasticWaterbottle4ozBoiled : ItemWaterBottle {
 	};
 };
 class ItemPlasticWaterbottle5ozBoiled : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE5OZBOILED;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE5OZBOILED_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE5OZBOILED;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE5OZBOILED_DESC;
 	infectionChance = 0;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle5oz.paa";
@@ -528,8 +531,8 @@ class ItemPlasticWaterbottle5ozBoiled : ItemWaterBottle {
 	};
 };
 class ItemPlasticWaterbottle6ozBoiled : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE6OZBOILED;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE6OZBOILED_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE6OZBOILED;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE6OZBOILED_DESC;
 	infectionChance = 0;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle6oz.paa";
@@ -558,8 +561,8 @@ class ItemPlasticWaterbottle6ozBoiled : ItemWaterBottle {
 	};
 };
 class ItemPlasticWaterbottle7ozBoiled : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE7OZBOILED;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE7OZBOILED_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE7OZBOILED;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE7OZBOILED_DESC;
 	infectionChance = 0;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle7oz.paa";
@@ -588,8 +591,8 @@ class ItemPlasticWaterbottle7ozBoiled : ItemWaterBottle {
 	};
 };
 class ItemPlasticWaterbottle8ozBoiled : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE8OZBOILED;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE8OZBOILED_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE8OZBOILED;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE8OZBOILED_DESC;
 	infectionChance = 0;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle8oz.paa";
@@ -618,8 +621,8 @@ class ItemPlasticWaterbottle8ozBoiled : ItemWaterBottle {
 	};
 };
 class ItemPlasticWaterbottle9ozBoiled : ItemWaterBottle {
-	displayName = $STR_EPOCH_WATERBOTTLE9OZBOILED;
-	descriptionShort = $STR_EPOCH_WATERBOTTLE9OZBOILED_DESC;
+	displayName = $STR_EPOCH_PET_WATERBOTTLE9OZBOILED;
+	descriptionShort = $STR_EPOCH_PET_WATERBOTTLE9OZBOILED_DESC;
 	infectionChance = 0;
 	model = "z\addons\dayz_communityassets\models\waterbottle.p3d";
 	picture = "\dayz_epoch_c\icons\plasticwaterbottle\PETwaterbottle9oz.paa";

SQF/dayz_code/Configs/CfgMagazines/Items/Canteen.hpp

@@ -1,21 +0,0 @@
-class ItemCanteenEmpty : CA_Magazine
-{
-	scope = public;
-	count = 1;
-	type = WeaponSlotItem;
-	
-	model = "\dayz_equip\models\waterbottle_gear.p3d";
-	picture = "\dayz_equip\textures\equip_waterbottle_empty_ca.paa";
-	displayName = $STR_ITEM_CANTEEN_EMPTY_NAME;
-	descriptionShort = $STR_ITEM_CANTEEN_DESC;
-	
-	//TODO
-	/*class ItemActions
-	{
-		class Fill
-		{
-			text = $STR_ACTIONS_FILL_W;
-			script = "spawn player_fillWater;";
-		};
-	};*/
-};

SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp

@@ -23,5 +23,4 @@
 #include "equip_brick.hpp"
 #include "equip_lever.hpp"
 #include "WaterBottle.hpp"
-//#include "Canteen.hpp"
 #include "Explosives.hpp"

SQF/dayz_code/stringtable.xml

@@ -3537,7 +3537,7 @@
 		</Key>
 		<Key ID="STR_EQUIP_DESC_12">
 			<English>A bottle of water that has been filled and can be consumed.</English>
-			<German>Eine Flasche, gefüllt mit Trinkwasser.</German>
+			<German>Eine Flasche gefüllt mit Trinkwasser.</German>
 			<Russian>Наполненная водой пластиковая бутылка. Вода сомнительного качества.</Russian>
 			<Spanish>Una botella de agua llena que puede consumirse.</Spanish>
 			<French>Bouteille (pleine)</French>
@@ -3545,7 +3545,7 @@
 		</Key>
 		<Key ID="STR_EQUIP_NAME_13">
 			<English>Water Bottle (Empty)</English>
-			<German>Leere Wasserflasche</German>
+			<German>Wasserflasche (Leer)</German>
 			<Russian>Бутылка (пустая)</Russian>
 			<Spanish>Cantimplora (Vacía)</Spanish>
 			<French>Bouteille (vide)</French>
@@ -3557,7 +3557,7 @@
 			<German>Ausleeren</German>
 		</Key>
 		<Key ID="STR_EQUIP_DESC_13">
-			<English>A bottle of water that is Empty. It might be useful to fill it with water again.</English>
+			<English>A bottle of water that is empty. It might be useful to fill it with water again.</English>
 			<German>Eine leere Wasserflasche. Sie könnte nützlich sein, um sie wieder mit Wasser zu füllen.</German>
 			<Russian>Пустая бутылка, которую можно наполнить водой.</Russian>
 			<Spanish>Una botella de agua vacía. Puede ser útil si se la llena con agua de nuevo.</Spanish>
@@ -5027,39 +5027,9 @@
 			<French>Un Bar cuit (valeur:1400).</French>
 			<German>Ein gebratener Wolfsbarsch, welcher reich an Eiweiß und Omega-3-Fettsäuren ist.</German>
 		</Key>
-		<Key ID="STR_ITEM_CANTEEN_NAME">
-			<English>Canteen</English>
-			<Russian>Котелок</Russian>
-			<German>Feldflasche</German>
-		</Key>
-		<Key ID="STR_ITEM_CANTEEN_DESC">
-			<English>A sturdy military canteen used to hold liquids for consumption.</English>
-			<Russian>Армейский котелок для хранения жидкостей и еды.</Russian>
-			<German>Eine stabile Feldflasche, um Wasser zu transportieren.</German>
-		</Key>
-		<Key ID="STR_ITEM_CANTEEN_EMPTY">
-			<English>Empty</English>
-			<Russian>Пустой</Russian>
-			<German>Ausleeren</German>
-		</Key>
-		<Key ID="STR_ITEM_CANTEEN_EMPTY_NAME">
-			<English>Canteen (empty)</English>
-			<Russian>Котелок (Пустой)</Russian>
-			<German>Feldflasche (leer)</German>
-		</Key>
-		<Key ID="STR_ITEM_CANTEEN_BOILED_NAME">
-			<English>Canteen (boiled)</English>
-			<Russian>Котелок (Прокипяченый)</Russian>
-			<German>Feldflasche (abgekocht)</German>
-		</Key>
-		<Key ID="STR_ITEM_CANTEEN_HERBAL_NAME">
-			<English>Canteen (herbal drink)</English>
-			<Russian>Котелок (Травяной напиток)</Russian>
-			<German>Feldflasche (Kräutertrunk)</German>
-		</Key>
 		<Key ID="STR_ITEMWATERBOTTLEBOILED_CODE_NAME">
 			<English>Water Bottle (Boiled)</English>
-			<German>Wasserflasche (abgekocht)</German>
+			<German>Wasserflasche (Abgekocht)</German>
 			<Russian>Бутылка (чистая вода)</Russian>
 			<Spanish>Cantimplora con Agua Hervida</Spanish>
 			<French>Bouteille (Eau bouillie)</French>
@@ -5075,7 +5045,7 @@
 		</Key>
 		<Key ID="STR_ITEMWATERBOTTLEDMG_CODE_NAME">
 			<English>Water Bottle (Broken)</English>
-			<German>Wasserflasche (undicht)</German>
+			<German>Wasserflasche (Undicht)</German>
 			<Russian>Бутылка (испорчена)</Russian>
 			<Czech>Láhev na vodu (děravá)</Czech>
 		</Key>
@@ -14996,92 +14966,92 @@
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE1OZBOILED">
 			<English>Water Bottle (Boiled 1oz)</English>
-			<German>Wasserflasche (abgekocht 100ml)</German>
+			<German>Wasserflasche (Abgek. 100ml)</German>
 			<Russian>Бутылка (чистая вода 1 унция)</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE1OZBOILED_DESC">
-			<English>Water Bottle with 1oz of water (Boiled).</English>
-			<German>Wasserflasche mit 100ml Wasser (abgekocht).</German>
+			<English>Water Bottle with 1oz of boiled water.</English>
+			<German>Wasserflasche mit 100ml abgekochtem Wasser.</German>
 			<Russian>Бутылка с 1 унцией чистой кипяченой воды.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE2OZBOILED">
 			<English>Water Bottle (Boiled 2oz)</English>
-			<German>Wasserflasche (abgekocht 200ml)</German>
+			<German>Wasserflasche (Abgek. 200ml)</German>
 			<Russian>Бутылка (чистая вода 2 унции)</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE2OZBOILED_DESC">
-			<English>Water Bottle with 2oz of water (Boiled).</English>
-			<German>Wasserflasche mit 200ml Wasser (abgekocht).</German>
+			<English>Water Bottle with 2oz of boiled water.</English>
+			<German>Wasserflasche mit 200ml abgekochtem Wasser.</German>
 			<Russian>Бутылка с 2 унциями чистой кипяченой воды.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE3OZBOILED">
 			<English>Water Bottle (Boiled 3oz)</English>
-			<German>Wasserflasche (abgekocht 300ml)</German>
+			<German>Wasserflasche (Abgek. 300ml)</German>
 			<Russian>Бутылка (чистая вода 3 унции)</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE3OZBOILED_DESC">
-			<English>Water Bottle with 3oz of water (Boiled).</English>
-			<German>Wasserflasche mit 300ml Wasser (abgekocht).</German>
+			<English>Water Bottle with 3oz of boiled water.</English>
+			<German>Wasserflasche mit 300ml abgekochtem Wasser.</German>
 			<Russian>Бутылка с 3 унциями чистой кипяченой воды.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE4OZBOILED">
 			<English>Water Bottle (Boiled 4oz)</English>
-			<German>Wasserflasche (abgekocht 400ml)</German>
+			<German>Wasserflasche (Abgek. 400ml)</German>
 			<Russian>Бутылка (чистая вода 4 унции)</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE4OZBOILED_DESC">
-			<English>Water Bottle with 4oz of water (Boiled).</English>
-			<German>Wasserflasche mit 400ml Wasser (abgekocht).</German>
+			<English>Water Bottle with 4oz of boiled water.</English>
+			<German>Wasserflasche mit 400ml abgekochtem Wasser.</German>
 			<Russian>Бутылка с 4 унциями чистой кипяченой воды.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE5OZBOILED">
 			<English>Water Bottle (Boiled 5oz)</English>
-			<German>Wasserflasche (abgekocht 500ml)</German>
+			<German>Wasserflasche (Abgek. 500ml)</German>
 			<Russian>Бутылка (чистая вода 5 унций)</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE5OZBOILED_DESC">
-			<English>Water Bottle with 5oz of water (Boiled).</English>
-			<German>Wasserflasche mit 500ml Wasser (abgekocht).</German>
+			<English>Water Bottle with 5oz of boiled water.</English>
+			<German>Wasserflasche mit 500ml abgekochtem Wasser.</German>
 			<Russian>Бутылка с 5 унциями чистой кипяченой воды.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE6OZBOILED">
 			<English>Water Bottle (Boiled 6oz)</English>
-			<German>Wasserflasche (abgekocht 600ml)</German>
+			<German>Wasserflasche (Abgek. 600ml)</German>
 			<Russian>Бутылка (чистая вода 6 унций)</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE6OZBOILED_DESC">
-			<English>Water Bottle with 6oz of water (Boiled).</English>
-			<German>Wasserflasche mit 600ml Wasser (abgekocht).</German>
+			<English>Water Bottle with 6oz of boiled water.</English>
+			<German>Wasserflasche mit 600ml abgekochtem Wasser.</German>
 			<Russian>Бутылка с 6 унциями чистой кипяченой воды.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE7OZBOILED">
 			<English>Water Bottle (Boiled 7oz)</English>
-			<German>Wasserflasche (abgekocht 700ml)</German>
+			<German>Wasserflasche (Abgek. 700ml)</German>
 			<Russian>Бутылка (чистая вода 7 унций)</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE7OZBOILED_DESC">
-			<English>Water Bottle with 7oz of water (Boiled).</English>
-			<German>Wasserflasche mit 700ml Wasser (abgekocht).</German>
+			<English>Water Bottle with 7oz of boiled water.</English>
+			<German>Wasserflasche mit 700ml abgekochtem Wasser.</German>
 			<Russian>Бутылка с 7 унциями чистой кипяченой воды.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE8OZBOILED">
 			<English>Water Bottle (Boiled 8oz)</English>
-			<German>Wasserflasche (abgekocht 800ml)</German>
+			<German>Wasserflasche (Abgek. 800ml)</German>
 			<Russian>Бутылка (чистая вода 8 унций)</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE8OZBOILED_DESC">
-			<English>Water Bottle with 8oz of water (Boiled).</English>
-			<German>Wasserflasche mit 800ml Wasser (abgekocht).</German>
+			<English>Water Bottle with 8oz of boiled water.</English>
+			<German>Wasserflasche mit 800ml abgekochtem Wasser.</German>
 			<Russian>Бутылка с 8 унциями чистой кипяченой воды.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE9OZBOILED">
 			<English>Water Bottle (Boiled 9oz)</English>
-			<German>Wasserflasche (abgekocht 900ml)</German>
+			<German>Wasserflasche (Abgek. 900ml)</German>
 			<Russian>Бутылка (чистая вода 9 унций)</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_WATERBOTTLE9OZBOILED_DESC">
-			<English>Water Bottle with 9oz of water (Boiled).</English>
-			<German>Wasserflasche mit 900ml Wasser (abgekocht).</German>
+			<English>Water Bottle with 9oz of boiled water.</English>
+			<German>Wasserflasche mit 900ml abgekochtem Wasser.</German>
 			<Russian>Бутылка с 9 унциями чистой кипяченой воды.</Russian>
 		</Key>
 		<Key ID="STR_EPOCH_BRIEFCASE">
@@ -17357,6 +17327,192 @@
 			<Russian>АК-107 ГП-25 ПСО-1</Russian>
 		</Key>
 		
+		<!--PET waterbottles -->
+		<Key ID="STR_EQUIP_NAME_WBPET_01">
+			<English>Water Bottle PET (Empty)</English>
+			<German>Wasserflasche PET (Leer)</German>
+		</Key>
+		<Key ID="STR_EQUIP_DESC_WBPET_01">
+			<English>A PET bottle of water that is empty. It might be useful to fill it with water again.</English>
+			<German>Eine leere Plastik-Wasserflasche. Sie könnte nützlich sein, um sie wieder mit Wasser zu füllen.</German>
+		</Key>
+		<Key ID="STR_EQUIP_NAME_WBPET_02">
+			<English>Water Bottle PET (Broken)</English>
+			<German>Wasserflasche PET (Undicht)</German>
+		</Key>
+		<Key ID="STR_EQUIP_DESC_WBPET_02">
+			<English>Broken PET Water Bottle that might be repairable.</English>
+			<German>Eine undichte Plastik-Wasserflasche, die repariert werden kann.</German>
+		</Key>
+		<Key ID="STR_EQUIP_NAME_WBPET_03">
+			<English>Water Bottle PET</English>
+			<German>Wasserflasche PET</German>
+		</Key>
+		<Key ID="STR_EQUIP_DESC_WBPET_03">
+			<English>A PET bottle of water that has been filled and can be consumed.</English>
+			<German>Eine Plastik-Wasserflasche, gefüllt mit nicht abgekochtem Wasser.</German>
+		</Key>
+		<Key ID="STR_EQUIP_NAME_WBPET_04">
+			<English>Water Bottle PET (Boiled)</English>
+			<German>Wasserflasche PET (Abgekocht)</German>
+		</Key>
+		<Key ID="STR_EQUIP_DESC_WBPET_04">
+			<English>A PET bottle of boiled water that has been filled and can be consumed.</English>
+			<German>Eine Plastik-Wasserflasche gefüllt mit abgekochtem Wasser.</German>
+		</Key>
+		<Key ID="STR_EQUIP_NAME_WBPET_05">
+			<English>Herbal Drink (PET)</English>
+			<German>Kräutertrunk (PET)</German>
+		</Key>
+		<Key ID="STR_EQUIP_DESC_WBPET_05">
+			<English>A drink mixed with herbs that may help heal infection.</English>
+			<German>Ein Getränk aus Kräutern, welches bei Infektionen helfen könnte.</German>
+		</Key>	
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE1OZ">
+			<English>Water Bottle PET (1oz)</English>
+			<German>Wasserflasche PET (100ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE1OZ_DESC">
+			<English>Water Bottle PET with 1oz of water.</English>
+			<German>Wasserflasche PET mit 100ml Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE2OZ">
+			<English>Water Bottle PET (2oz)</English>
+			<German>Wasserflasche PET (200ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE2OZ_DESC">
+			<English>Water Bottle PET with 2oz of water.</English>
+			<German>Wasserflasche PET mit 200ml Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE3OZ">
+			<English>Water Bottle PET (3oz)</English>
+			<German>Wasserflasche PET (300ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE3OZ_DESC">
+			<English>Water Bottle PET with 3oz of water.</English>
+			<German>Wasserflasche PET mit 300ml Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE4OZ">
+			<English>Water Bottle PET (4oz)</English>
+			<German>Wasserflasche PET (400ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE4OZ_DESC">
+			<English>Water Bottle PET with 4oz of water.</English>
+			<German>Wasserflasche PET mit 400ml Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE5OZ">
+			<English>Water Bottle PET (5oz)</English>
+			<German>Wasserflasche PET (500ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE5OZ_DESC">
+			<English>Water Bottle PET with 5oz of water.</English>
+			<German>Wasserflasche PET mit 500ml Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE6OZ">
+			<English>Water Bottle PET (6oz)</English>
+			<German>Wasserflasche PET (600ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE6OZ_DESC">
+			<English>Water Bottle PET with 6oz of water.</English>
+			<German>Wasserflasche PET mit 600ml Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE7OZ">
+			<English>Water Bottle PET (7oz)</English>
+			<German>Wasserflasche PET (700ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE7OZ_DESC">
+			<English>Water Bottle PET with 7oz of water.</English>
+			<German>Wasserflasche PET mit 700ml Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE8OZ">
+			<English>Water Bottle PET (8oz)</English>
+			<German>Wasserflasche PET (800ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE8OZ_DESC">
+			<English>Water Bottle PET with 8oz of water.</English>
+			<German>Wasserflasche PET mit 800ml Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE9OZ">
+			<English>Water Bottle PET (9oz)</English>
+			<German>Wasserflasche PET (900ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE9OZ_DESC">
+			<English>Water Bottle PET with 9oz of water.</English>
+			<German>Wasserflasche PET mit 900ml Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE1OZBOILED">
+			<English>Water Bottle PET (Boiled 1oz)</English>
+			<German>Wasserflasche PET (Abgek. 100ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE1OZBOILED_DESC">
+			<English>Water Bottle PET with 1oz of boiled water.</English>
+			<German>Wasserflasche PET mit 100ml abgekochtem Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE2OZBOILED">
+			<English>Water Bottle PET (Boiled 2oz)</English>
+			<German>Wasserflasche PET (Abgek. 200ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE2OZBOILED_DESC">
+			<English>Water Bottle PET with 2oz of boiled water.</English>
+			<German>Wasserflasche PET mit 200ml abgekochtem Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE3OZBOILED">
+			<English>Water Bottle PET (Boiled 3oz)</English>
+			<German>Wasserflasche PET (Abgek. 300ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE3OZBOILED_DESC">
+			<English>Water Bottle PET with 3oz of boiled water.</English>
+			<German>Wasserflasche PET mit 300ml abgekochtem Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE4OZBOILED">
+			<English>Water Bottle PET (Boiled 4oz)</English>
+			<German>Wasserflasche PET (Abgek. 400ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE4OZBOILED_DESC">
+			<English>Water Bottle PET with 4oz of boiled water.</English>
+			<German>Wasserflasche PET mit 400ml abgekochtem Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE5OZBOILED">
+			<English>Water Bottle PET (Boiled 5oz)</English>
+			<German>Wasserflasche PET (Abgek. 500ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE5OZBOILED_DESC">
+			<English>Water Bottle PET with 5oz of boiled water.</English>
+			<German>Wasserflasche PET mit 500ml abgekochtem Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE6OZBOILED">
+			<English>Water Bottle PET (Boiled 6oz)</English>
+			<German>Wasserflasche PET (Abgek. 600ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE6OZBOILED_DESC">
+			<English>Water Bottle PET with 6oz of boiled water.</English>
+			<German>Wasserflasche PET mit 600ml abgekochtem Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE7OZBOILED">
+			<English>Water Bottle PET (Boiled 7oz)</English>
+			<German>Wasserflasche PET (Abgek. 700ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE7OZBOILED_DESC">
+			<English>Water Bottle PET with 7oz of boiled water.</English>
+			<German>Wasserflasche PET mit 700ml abgekochtem Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE8OZBOILED">
+			<English>Water Bottle PET (Boiled 8oz)</English>
+			<German>Wasserflasche PET (Abgek. 800ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE8OZBOILED_DESC">
+			<English>Water Bottle PET with 8oz of boiled water.</English>
+			<German>Wasserflasche PET mit 800ml abgekochtem Wasser.</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE9OZBOILED">
+			<English>Water Bottle PET (Boiled 9oz)</English>
+			<German>Wasserflasche PET (Abgek. 900ml)</German>
+		</Key>
+		<Key ID="STR_EPOCH_PET_WATERBOTTLE9OZBOILED_DESC">
+			<English>Water Bottle PET with 9oz of boiled water.</English>
+			<German>Wasserflasche PET mit 900ml abgekochtem Wasser.</German>
+		</Key>
+		
 		<!--Namalsk compatibility-->
 		 <Key ID="STR_EQUIP_NAME_43">
 		 	<English>Winter Ghillie Suit</English>